mirror of
https://github.com/kaboomserver/extras.git
synced 2025-02-20 03:04:44 -05:00
Temporary mitigations before 1.15
This commit is contained in:
parent
91a1b47054
commit
61562aa29d
6 changed files with 45 additions and 18 deletions
|
@ -330,6 +330,7 @@ public class Main extends JavaPlugin {
|
||||||
"tellraw",
|
"tellraw",
|
||||||
|
|
||||||
"minecraft:clear",
|
"minecraft:clear",
|
||||||
|
"minecraft:data",
|
||||||
"minecraft:datapack",
|
"minecraft:datapack",
|
||||||
"minecraft:effect",
|
"minecraft:effect",
|
||||||
"minecraft:execute",
|
"minecraft:execute",
|
||||||
|
@ -337,6 +338,7 @@ public class Main extends JavaPlugin {
|
||||||
"minecraft:gamerule",
|
"minecraft:gamerule",
|
||||||
"minecraft:me",
|
"minecraft:me",
|
||||||
"minecraft:msg",
|
"minecraft:msg",
|
||||||
|
"minecraft:replaceitem",
|
||||||
"minecraft:say",
|
"minecraft:say",
|
||||||
"minecraft:spreadplayers",
|
"minecraft:spreadplayers",
|
||||||
"minecraft:tell",
|
"minecraft:tell",
|
||||||
|
@ -345,6 +347,7 @@ public class Main extends JavaPlugin {
|
||||||
"minecraft:tp",
|
"minecraft:tp",
|
||||||
"minecraft:worldborder",
|
"minecraft:worldborder",
|
||||||
"clear",
|
"clear",
|
||||||
|
"data",
|
||||||
"datapack",
|
"datapack",
|
||||||
"effect",
|
"effect",
|
||||||
"execute",
|
"execute",
|
||||||
|
@ -352,6 +355,7 @@ public class Main extends JavaPlugin {
|
||||||
"gamerule",
|
"gamerule",
|
||||||
"me",
|
"me",
|
||||||
"msg",
|
"msg",
|
||||||
|
"replaceitem",
|
||||||
"say",
|
"say",
|
||||||
"spreadplayers",
|
"spreadplayers",
|
||||||
"tell",
|
"tell",
|
||||||
|
|
|
@ -14,7 +14,7 @@ import org.bukkit.entity.Player;
|
||||||
class CommandJumpscare implements CommandExecutor {
|
class CommandJumpscare implements CommandExecutor {
|
||||||
private void createJumpscare(Player player) {
|
private void createJumpscare(Player player) {
|
||||||
player.spawnParticle(Particle.MOB_APPEARANCE, player.getLocation(), 4);
|
player.spawnParticle(Particle.MOB_APPEARANCE, player.getLocation(), 4);
|
||||||
for (int i = 0; i < 10; ++i) {
|
for (int i = 0; i < 10; i++) {
|
||||||
player.playSound(player.getLocation(), Sound.ENTITY_ENDERMAN_SCREAM, 1, 0);
|
player.playSound(player.getLocation(), Sound.ENTITY_ENDERMAN_SCREAM, 1, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
package pw.kaboom.extras;
|
package pw.kaboom.extras;
|
||||||
|
|
||||||
|
import org.bukkit.block.BlockState;
|
||||||
|
import org.bukkit.block.CommandBlock;
|
||||||
|
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
import org.bukkit.event.block.BlockPlaceEvent;
|
import org.bukkit.event.block.BlockPlaceEvent;
|
||||||
import org.bukkit.event.block.SignChangeEvent;
|
import org.bukkit.event.block.SignChangeEvent;
|
||||||
|
|
||||||
|
import org.bukkit.event.world.ChunkLoadEvent;
|
||||||
|
|
||||||
class BlockCheck implements Listener {
|
class BlockCheck implements Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onBlockPlace(BlockPlaceEvent event) {
|
void onBlockPlace(BlockPlaceEvent event) {
|
||||||
|
@ -19,6 +24,24 @@ class BlockCheck implements Listener {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
void onChunkLoad(ChunkLoadEvent event) {
|
||||||
|
if (!event.isNewChunk()) {
|
||||||
|
try {
|
||||||
|
for (BlockState block : event.getChunk().getTileEntities()) {
|
||||||
|
if (block instanceof CommandBlock) {
|
||||||
|
block.update();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Exception exception) {
|
||||||
|
event.getChunk().getWorld().regenerateChunk(
|
||||||
|
event.getChunk().getX(),
|
||||||
|
event.getChunk().getZ()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onSignChange(SignChangeEvent event) {
|
void onSignChange(SignChangeEvent event) {
|
||||||
|
|
|
@ -73,12 +73,12 @@ class BlockPhysics implements Listener {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*@EventHandler
|
@EventHandler
|
||||||
void onBlockPhysics(BlockPhysicsEvent event) {
|
void onBlockPhysics(BlockPhysicsEvent event) {
|
||||||
if (event.getSourceBlock().getState() instanceof CommandBlock) {
|
if (event.getSourceBlock().getState() instanceof CommandBlock) {
|
||||||
event.getSourceBlock().getState().update();
|
event.getSourceBlock().getState().update();
|
||||||
}
|
}
|
||||||
}*/
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onBlockRedstone(BlockRedstoneEvent event) {
|
void onBlockRedstone(BlockRedstoneEvent event) {
|
||||||
|
|
|
@ -16,6 +16,8 @@ import org.bukkit.event.Event;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
|
import org.bukkit.event.inventory.InventoryCloseEvent;
|
||||||
|
|
||||||
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
|
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
import org.bukkit.event.player.PlayerKickEvent;
|
import org.bukkit.event.player.PlayerKickEvent;
|
||||||
|
@ -29,8 +31,6 @@ import org.bukkit.inventory.meta.BannerMeta;
|
||||||
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
import com.destroystokyo.paper.event.player.PlayerConnectionCloseEvent;
|
|
||||||
|
|
||||||
class PlayerConnection implements Listener {
|
class PlayerConnection implements Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onAsyncPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
|
void onAsyncPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
|
||||||
|
@ -41,10 +41,14 @@ class PlayerConnection implements Listener {
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onPlayerConnectionClose(final PlayerConnectionCloseEvent event) {
|
void onInventoryClose(InventoryCloseEvent event) {
|
||||||
PlayerCommand.commandMillisList.remove(event.getPlayerUniqueId());
|
for (int i = 0; i < 64; i++) {
|
||||||
PlayerInteract.interactMillisList.remove(event.getPlayerUniqueId());
|
//for (ItemStack item : event.getInventory().getContents()) {
|
||||||
Main.skinInProgress.remove(event.getPlayerUniqueId());
|
System.out.println(event.getInventory().getItem(i));
|
||||||
|
if (EntitySpawn.isIllegalItem(event.getInventory().getItem(i))) {
|
||||||
|
event.getInventory().clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
|
@ -107,13 +111,9 @@ class PlayerConnection implements Listener {
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onPlayerQuit(PlayerQuitEvent event) {
|
void onPlayerQuit(PlayerQuitEvent event) {
|
||||||
final Inventory inventory = event.getPlayer().getInventory();
|
PlayerCommand.commandMillisList.remove(event.getPlayer().getUniqueId());
|
||||||
|
PlayerInteract.interactMillisList.remove(event.getPlayer().getUniqueId());
|
||||||
for (ItemStack item : inventory.getContents()) {
|
Main.skinInProgress.remove(event.getPlayer().getUniqueId());
|
||||||
if (EntitySpawn.isIllegalItem(item)) {
|
|
||||||
inventory.clear();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final World world = event.getPlayer().getWorld();
|
final World world = event.getPlayer().getWorld();
|
||||||
|
|
||||||
|
|
|
@ -9,10 +9,10 @@ class ServerPing implements Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
void onServerListPing(PaperServerListPingEvent event) {
|
void onServerListPing(PaperServerListPingEvent event) {
|
||||||
if (event.getClient().getProtocolVersion() == -1) {
|
if (event.getClient().getProtocolVersion() == -1) {
|
||||||
event.setProtocolVersion(498);
|
event.setProtocolVersion(573);
|
||||||
} else {
|
} else {
|
||||||
event.setProtocolVersion(event.getClient().getProtocolVersion());
|
event.setProtocolVersion(event.getClient().getProtocolVersion());
|
||||||
}
|
}
|
||||||
event.setVersion("1.14.4");
|
event.setVersion("1.15");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue