chipmunk.land-kaboomserver/extras
2
0
Fork 0
forked from kaboomserver/extras
Code Issues Pull requests Projects Releases Packages Wiki Activity

More TNT optimizations

Browse source
This commit is contained in:
mathiascode 2019-12-03 07:46:17 +02:00
parent 86b3e68a4a
commit 95a0b66af2
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/pw/kaboom/extras/modules/block/BlockPhysics.java
View file

@ -73,12 +73,12 @@ class BlockPhysics implements Listener {
}
}
@EventHandler
/*@EventHandler
void onBlockPhysics(BlockPhysicsEvent event) {
if (event.getSourceBlock().getState() instanceof CommandBlock) {
event.getSourceBlock().getState().update();
}
}
}*/
@EventHandler
void onBlockRedstone(BlockRedstoneEvent event) {

18
src/main/java/pw/kaboom/extras/modules/entity/EntitySpawn.java
View file

@ -47,6 +47,7 @@ import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.inventory.meta.PotionMeta;
import com.destroystokyo.paper.event.block.TNTPrimeEvent;
import com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason;
import com.destroystokyo.paper.event.entity.EntityAddToWorldEvent;
import com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent;
@ -101,7 +102,7 @@ class EntitySpawn implements Listener {
final int worldDragonCount = location.getWorld().getEntitiesByClass(EnderDragon.class).size();
final int worldDragonCountLimit = 24;
if ((entityType != EntityType.PLAYER &&
isEntityLimitReached(location, chunkEntityCount, chunkEntityCountLimit, isAddToWorldEvent)) ||
@ -159,11 +160,6 @@ class EntitySpawn implements Listener {
}
}
return true;
} else if (tntCount > 180) {
for (Entity tnt : world.getEntitiesByClass(TNTPrimed.class)) {
tnt.remove();
}
return true;
}
return false;
}
@ -378,12 +374,10 @@ class EntitySpawn implements Listener {
@EventHandler
void onTNTPrime(TNTPrimeEvent event) {
final double tps = Bukkit.getTPS()[0];
final int tntCount = event.getBlock().getWorld().getEntitiesByClass(TNTPrimed.class).size();
if (tps < 10 ||
tntCount > 140) {
event.setCancelled(true);
if (event.getBlock().getWorld().getEntitiesByClass(TNTPrimed.class).size() > 120) {
if (event.getReason() == PrimeReason.EXPLOSION) {
event.setCancelled(true);
}
}
}
}