From 7546fa0e1e0dc0ad7fd137e0893f4fe248ffeeea Mon Sep 17 00:00:00 2001
From: mathiascode <mail@mathias.is>
Date: Fri, 28 Feb 2020 22:43:02 +0200
Subject: [PATCH] TNT optimization test

---
 .../extras/modules/entity/EntitySpawn.java    | 63 ++++++++++++-------
 1 file changed, 41 insertions(+), 22 deletions(-)

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 8bb057c..9da4d74 100644
--- a/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java
+++ b/src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java
@@ -18,8 +18,8 @@ import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.SpawnerSpawnEvent;
 import org.bukkit.event.vehicle.VehicleCreateEvent;
 import org.bukkit.event.weather.LightningStrikeEvent;
@@ -69,22 +69,40 @@ public final class EntitySpawn implements Listener {
 		EntitySpawnEvent's event cancel
 		*/
 
-		final int chunkEntityCount =
-				!isAddToWorldEvent ? chunk.getEntities().length + 1
-				: chunk.getEntities().length;
-		final int chunkEntityCountLimit = 30;
+		switch (entityType) {
+		case ENDER_DRAGON:
+			final int worldDragonCount =
+			!isAddToWorldEvent ? world.getEntitiesByClass(EnderDragon.class).size() + 1
+			: world.getEntitiesByClass(EnderDragon.class).size();
+			final int worldDragonCountLimit = 24;
 
-		final int worldDragonCount =
-				!isAddToWorldEvent ? world.getEntitiesByClass(EnderDragon.class).size() + 1
-				: world.getEntitiesByClass(EnderDragon.class).size();
-		final int worldDragonCountLimit = 24;
+			if (worldDragonCount >= worldDragonCountLimit) {
+				return true;
+			}
 
-		if ((!EntityType.PLAYER.equals(entityType)
-				&& chunkEntityCount >= chunkEntityCountLimit)
+			break;
+		case PRIMED_TNT:
+			final int worldTntCount =
+			!isAddToWorldEvent ? world.getEntitiesByClass(TNTPrimed.class).size() + 1
+			: world.getEntitiesByClass(TNTPrimed.class).size();
+			final int worldTntCountLimit = 100;
 
-				|| (EntityType.ENDER_DRAGON.equals(entityType)
-						&& worldDragonCount >= worldDragonCountLimit)) {
-			return true;
+			if (worldTntCount >= worldTntCountLimit) {
+				return true;
+			}
+
+			break;
+		default:
+			if (!EntityType.PLAYER.equals(entityType)) {
+				final int chunkEntityCount =
+						!isAddToWorldEvent ? chunk.getEntities().length + 1
+						: chunk.getEntities().length;
+				final int chunkEntityCountLimit = 30;
+				if (chunkEntityCount >= chunkEntityCountLimit) {
+					return true;
+				}
+			}
+			break;
 		}
 		return false;
 	}
@@ -215,7 +233,7 @@ public final class EntitySpawn implements Listener {
 	}
 
 	@EventHandler
-	void onEntityExplode(final EntityExplodeEvent event) {
+	void onExplosionPrime(final ExplosionPrimeEvent event) {
 		if (EntityType.MINECART_TNT.equals(event.getEntityType())
 				&& event.getEntity().getWorld().getEntitiesByClass(ExplosiveMinecart.class).size() > 80) {
 			event.setCancelled(true);
@@ -233,10 +251,9 @@ public final class EntitySpawn implements Listener {
 			return;
 		}
 
-		final Entity entity = event.getEntity();
-		final EntityType entityType = entity.getType();
-		final Chunk chunk = entity.getChunk();
-		final World world = entity.getWorld();
+		final EntityType entityType = event.getEntityType();
+		final Chunk chunk = event.getLocation().getChunk();
+		final World world = event.getLocation().getWorld();
 		final boolean isAddToWorldEvent = false;
 
 		if (isEntityLimitReached(entityType, chunk, world, isAddToWorldEvent)) {
@@ -244,6 +261,8 @@ public final class EntitySpawn implements Listener {
 			return;
 		}
 
+		final Entity entity = event.getEntity();
+
 		applyEntityChanges(entity);
 	}
 
@@ -259,9 +278,9 @@ public final class EntitySpawn implements Listener {
 			return;
 		}
 
-		final EntityType entityType = lightning.getType();
+		final EntityType entityType = EntityType.LIGHTNING;
 		final Chunk chunk = lightning.getChunk();
-		final World world = lightning.getWorld();
+		final World world = event.getWorld();
 		final boolean isAddToWorldEvent = false;
 
 		if (isEntityLimitReached(entityType, chunk, world, isAddToWorldEvent)) {
@@ -306,7 +325,7 @@ public final class EntitySpawn implements Listener {
 		case EXPLOSION:
 		case FIRE:
 		case REDSTONE:
-			if (event.getBlock().getWorld().getEntitiesByClass(TNTPrimed.class).size() > 120) {
+			if (event.getBlock().getWorld().getEntitiesByClass(TNTPrimed.class).size() > 100) {
 				event.setCancelled(true);
 			}
 			return;