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 e190744..77bded6 100644 --- a/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java +++ b/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java @@ -349,7 +349,15 @@ class EntitySpawn implements Listener { event.getEntity().getItemStack().getItemMeta(); } catch (Exception | StackOverflowError exception) { event.setCancelled(true); + return; } + + + /*PotionMeta potion = (PotionMeta) event.getEntity().getItemStack().getItemMeta(); + System.out.println(potion.getColor().asRGB()); + if (potion.getColor().asRGB() < 0) { + event.setCancelled(true); + }*/ } @EventHandler 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 101830c..83ffc2d 100644 --- a/src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java +++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java @@ -81,6 +81,9 @@ class PlayerCommand implements Listener { Double.parseDouble(arr[2]) > 100) { event.setMessage(command.replaceFirst(arr[2], "100")); } + } else if ("/minecraft:give".equalsIgnoreCase(arr[0]) || + "/give".equalsIgnoreCase(arr[0])) { + event.setMessage(command.replace("Color:-", "Color:")); } else if (("/minecraft:particle".equalsIgnoreCase(arr[0]) || "/particle".equalsIgnoreCase(arr[0])) && arr.length >= 10) { diff --git a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java index 5f4335c..b565f03 100644 --- a/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java +++ b/src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java @@ -73,7 +73,7 @@ class PlayerConnection implements Listener { item.hasItemMeta()) { if (item.getItemMeta() instanceof BannerMeta) { final BannerMeta banner = (BannerMeta) item.getItemMeta(); - + for (Pattern pattern : banner.getPatterns()) { if (pattern.getColor() == null) { player.getInventory().clear(); @@ -104,7 +104,7 @@ class PlayerConnection implements Listener { @EventHandler void onPlayerLogin(PlayerLoginEvent event) { if (event.getHostname().startsWith("play.flame.ga") && - event.getHostname().endsWith(":53950")) { + event.getHostname().endsWith(":25565")) { event.disallow(Result.KICK_OTHER, "You connected to the server using an outdated server address/IP.\nPlease use the following address/IP:\n\nkaboom.pw"); return; } diff --git a/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java b/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java index cb22fd1..dc505a8 100644 --- a/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java +++ b/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java @@ -83,6 +83,9 @@ class ServerCommand implements Listener { Double.parseDouble(arr[2]) > 100) { event.setCommand(command.replaceFirst(arr[2], "100")); } + } else if ("minecraft:give".equalsIgnoreCase(arr[0]) || + "give".equalsIgnoreCase(arr[0])) { + event.setCommand(command.replace("Color:-", "Color:")); } else if (("minecraft:particle".equalsIgnoreCase(arr[0]) || "particle".equalsIgnoreCase(arr[0])) && arr.length >= 10) {