Push WIP

src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java

@@ -2,6 +2,7 @@ package pw.kaboom.extras;
 
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
+import org.bukkit.FireworkEffect;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -21,6 +22,7 @@ import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Firework;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.MagmaCube;
 import org.bukkit.entity.Slime;
@@ -29,10 +31,14 @@ import org.bukkit.entity.TNTPrimed;
 import org.bukkit.event.block.BlockDispenseEvent;
 
 import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
+import org.bukkit.event.entity.EntityAirChangeEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.entity.SpawnerSpawnEvent;
 
+import org.bukkit.event.player.PlayerDropItemEvent;
+
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.BannerMeta;
 import org.bukkit.inventory.meta.BlockStateMeta;
@@ -48,6 +54,10 @@ import com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent;
 
 import  org.bukkit.block.banner.Pattern;
 
+import org.bukkit.plugin.java.JavaPlugin;
+
+import org.bukkit.scheduler.BukkitRunnable;
+
 class EntitySpawn implements Listener {
 	private void applyEntityChanges(Entity entity) {
 		final World world = entity.getWorld();
@@ -55,30 +65,28 @@ class EntitySpawn implements Listener {
 		if (entity instanceof LivingEntity) {
 			final LivingEntity mob = (LivingEntity) entity;
 
+			checkIllegalEquipment(mob);
 			limitFollowAttribute(mob);
 		}
 
 		switch (entity.getType()) {
-			case ARMOR_STAND:
-			case DROWNED:
-			case GIANT:
-			case HUSK:
-			case PIG_ZOMBIE:
-			case PLAYER:
-			case SKELETON:
-			case STRAY:
-			case WITHER_SKELETON:
-			case ZOMBIE:
-			case ZOMBIE_VILLAGER:
-				final LivingEntity mob = (LivingEntity) entity;
-				
-				checkIllegalEquipment(mob);
-				break;
 			case AREA_EFFECT_CLOUD:
 				final AreaEffectCloud cloud = (AreaEffectCloud) entity;
 				
 				limitAreaEffectCloudRadius(cloud);
 				break;
+			/*case FIREWORK:
+				final Firework firework = (Firework) entity;
+				firework.setFireworkMeta(null);
+
+				try {
+					for (FireworkEffect effect : firework.getFireworkMeta().getEffects()) {
+						System.out.println(effect.getType());
+					}
+				} catch (Exception exception) {
+					firework.setFireworkMeta(null);
+				}
+				break;*/
 			case MAGMA_CUBE:
 			case SLIME:
 				final Slime slime = (Slime) entity;
@@ -107,7 +115,7 @@ class EntitySpawn implements Listener {
 	private void checkIllegalEquipment(LivingEntity mob) {
 		try {
 			for (ItemStack item : mob.getEquipment().getArmorContents()) {
-				if (checkIllegalBannerItem(item)) {
+				if (isIllegalItem(item)) {
 					mob.getEquipment().setArmorContents(
 						new ItemStack[] {null, null, null, null}
 					);
@@ -122,7 +130,7 @@ class EntitySpawn implements Listener {
 		try {
 			ItemStack item = mob.getEquipment().getItemInMainHand();
 	
-			if (checkIllegalBannerItem(item)) {
+			if (isIllegalItem(item)) {
 				mob.getEquipment().setItemInMainHand(null);
 			}
 		} catch (Exception exception) {
@@ -132,7 +140,7 @@ class EntitySpawn implements Listener {
 		try {
 			ItemStack item = mob.getEquipment().getItemInOffHand();
 	
-			if (checkIllegalBannerItem(item)) {
+			if (isIllegalItem(item)) {
 				mob.getEquipment().setItemInOffHand(null);
 			}
 		} catch (Exception exception) {
@@ -140,22 +148,6 @@ class EntitySpawn implements Listener {
 		}
 	}
 
-	private boolean checkIllegalBannerItem(ItemStack item) {
-		if (item != null &&
-			item.hasItemMeta()) {
-			if (item.getItemMeta() instanceof BannerMeta) {
-				final BannerMeta banner = (BannerMeta) item.getItemMeta();
-
-				for (Pattern pattern : banner.getPatterns()) {
-					if (pattern.getColor() == null) {
-						return true;
-					}
-				}
-			}
-		}
-		return false;
-	}
-
 	private boolean checkShouldRemoveEntities(World world) {
 		final int entityCount = world.getEntities().size();
 		final int tntCount = world.getEntitiesByClass(TNTPrimed.class).size();
@@ -193,6 +185,26 @@ class EntitySpawn implements Listener {
 		return false;
 	}
 
+	public static boolean isIllegalItem(ItemStack item) {
+		try {
+			if (item != null &&
+				item.hasItemMeta()) {
+				if (item.getItemMeta() instanceof BannerMeta) {
+					final BannerMeta banner = (BannerMeta) item.getItemMeta();
+
+					for (Pattern pattern : banner.getPatterns()) {
+						if (pattern.getColor() == null) {
+							return true;
+						}
+					}
+				}
+			}
+		} catch (Exception | StackOverflowError exception) {
+			return true;
+		}
+		return false;
+	}
+
 	private void limitAreaEffectCloudRadius(AreaEffectCloud cloud) {
 		if (cloud.getRadius() > 40) {
 			cloud.setRadius(40);
@@ -274,6 +286,23 @@ class EntitySpawn implements Listener {
 		checkShouldRemoveEntities(world);
 	}
 
+	/*@EventHandler
+	void onEntityAirChange(EntityAirChangeEvent event) {
+		if (event.getAmount() == 300) {
+			final Entity entity = event.getEntity();
+
+			applyEntityChanges(entity);
+			if (entity instanceof LivingEntity) {
+				for (ItemStack item : ((LivingEntity) entity).getEquipment().getArmorContents()) {
+					System.out.println(item);
+				}
+			}
+
+			//entity.remove();
+			//applyEntityChanges(entity);
+		}
+	}*/
+
 	@EventHandler
 	void onEntitySpawn(EntitySpawnEvent event) {
 		final Entity entity = event.getEntity();
@@ -291,13 +320,24 @@ class EntitySpawn implements Listener {
 
 	@EventHandler
 	void onItemSpawn(ItemSpawnEvent event) {
-		try {
+		final ItemStack item = event.getEntity().getItemStack();
-			event.getEntity().getItemStack().getItemMeta();
+
-		} catch (Exception | StackOverflowError exception) {
+		if (isIllegalItem(item)) {
 			event.setCancelled(true);
 		}
 	}
 
+	@EventHandler
+	void onPlayerDropItem(PlayerDropItemEvent event) {
+		final Inventory inventory = event.getPlayer().getInventory();
+
+		for (ItemStack item : inventory.getContents()) {
+			if (isIllegalItem(item)) {
+				inventory.clear();
+			}
+		}
+	}
+
 	@EventHandler
 	void onPreCreatureSpawn(PreCreatureSpawnEvent event) {
 		final EntityType mobType = event.getType();

src/main/java/pw/kaboom/extras/modules/player/PlayerCommand.java

@@ -14,6 +14,8 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
 import org.bukkit.scheduler.BukkitRunnable;
 
+import org.bukkit.plugin.java.JavaPlugin;
+
 class PlayerCommand implements Listener {
 	@EventHandler
 	void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
@@ -85,13 +87,6 @@ class PlayerCommand implements Listener {
 				Double.parseDouble(arr[2]) > 100) {
 				event.setMessage(command.replaceFirst(arr[2], "100"));
 			}
-		} else if ("/minecraft:entitydata".equalsIgnoreCase(arr[0]) ||
-			"/minecraft:give".equalsIgnoreCase(arr[0]) ||
-			"/minecraft:replaceitem".equalsIgnoreCase(arr[0]) ||
-			"/entitydata".equalsIgnoreCase(arr[0]) ||
-			"/give".equalsIgnoreCase(arr[0]) ||
-			"/replaceitem".equalsIgnoreCase(arr[0])) {
-			event.setMessage(command.replace("Color:-", "Color:"));
 		} else if (("/minecraft:particle".equalsIgnoreCase(arr[0]) ||
 			"/particle".equalsIgnoreCase(arr[0])) &&
 			arr.length >= 10) {

src/main/java/pw/kaboom/extras/modules/player/PlayerConnection.java

@@ -12,6 +12,7 @@ import org.bukkit.block.banner.Pattern;
 
 import org.bukkit.entity.Player;
 
+import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
@@ -22,6 +23,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.BannerMeta;
 
@@ -54,27 +56,6 @@ class PlayerConnection implements Listener {
 		final int stay = 160;
 		final int fadeOut = 5;
 
-		if (player.hasPlayedBefore()) {
-			try {
-				for (ItemStack item : player.getInventory().getContents()) {
-					if (item != null &&
-						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();
-								}
-							}
-						}
-					}
-				}
-			} catch (Exception exception) {
-				player.getInventory().clear();
-			}
-		}
-
 		if (title != null ||
 			subtitle != null) {
 				player.sendTitle(
@@ -121,6 +102,14 @@ class PlayerConnection implements Listener {
 
 	@EventHandler
 	void onPlayerQuit(PlayerQuitEvent event) {
+		final Inventory inventory = event.getPlayer().getInventory();
+
+		for (ItemStack item : inventory.getContents()) {
+			if (EntitySpawn.isIllegalItem(item)) {
+				inventory.clear();
+			}
+		}
+
 		final World world = event.getPlayer().getWorld();
 
 		for (final Chunk chunk : world.getLoadedChunks()) {

src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java

@@ -72,11 +72,6 @@ class ServerCommand implements Listener {
 				Double.parseDouble(arr[2]) > 100) {
 				event.setCommand(command.replaceFirst(arr[2], "100"));
 			}
-		} else if ("minecraft:give".equalsIgnoreCase(arr[0]) ||
-			"minecraft:replaceitem".equalsIgnoreCase(arr[0]) ||
-			"give".equalsIgnoreCase(arr[0]) ||
-			"replaceitem".equalsIgnoreCase(arr[0])) {
-			event.setCommand(command.replace("Color:-", "Color:"));
 		} else if (("minecraft:particle".equalsIgnoreCase(arr[0]) ||
 			"particle".equalsIgnoreCase(arr[0])) &&
 			arr.length >= 10) {