diff --git a/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java b/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java index bcb962c..4433e05 100644 --- a/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java +++ b/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java @@ -321,7 +321,7 @@ class EntitySpawn implements Listener { final double tps = Bukkit.getTPS()[0]; if (tps < 10) { - event.setCancelled(true); + event.getBlock().setType(Material.AIR, false); } } } diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java index 2dc1be6..8d230b4 100644 --- a/src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java +++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java @@ -33,7 +33,19 @@ class PlayerCommand implements Listener { return; } - if (("/minecraft:gamerule".equalsIgnoreCase(arr[0]) || + if (("/minecraft:execute".equals(arr[0].toLowerCase()) || + "/execute".equals(arr[0].toLowerCase())) && + arr.length >= 1) { + final StringBuilder stringBuilder = new StringBuilder(); + + for (int i = 1; i < arr.length; i++) { + stringBuilder.append(arr[i] + " "); + } + if (stringBuilder.toString().toLowerCase().contains("execute") || + stringBuilder.toString().toLowerCase().contains("sudo")) { + event.setCancelled(true); + } + } else if (("/minecraft:gamerule".equalsIgnoreCase(arr[0]) || "/gamerule".equalsIgnoreCase(arr[0])) && arr.length >= 3) { if ("randomTickSpeed".equalsIgnoreCase(arr[1]) &&