kaboomserver/extras
1
0
Fork 1
mirror of https://github.com/kaboomserver/extras.git synced 2024-12-03 20:51:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Don't attempt to remove broken entities

Browse source
This commit is contained in:
kaboom 2022-05-21 20:14:24 +03:00
parent 9c42f5d9e9
commit afdd1c1b4f
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/pw/kaboom/extras/commands/CommandDestroyEntities.java
View file

@ -18,8 +18,13 @@ public final class CommandDestroyEntities implements CommandExecutor {
for (World world : Bukkit.getWorlds()) { for (World world : Bukkit.getWorlds()) {
for (Entity entity : world.getEntities()) { for (Entity entity : world.getEntities()) {
if (!EntityType.PLAYER.equals(entity.getType())) { if (!EntityType.PLAYER.equals(entity.getType())) {
try {
entity.remove(); entity.remove();
entityCount++; entityCount++;
} catch (Exception ignored) {
// Broken entity
continue;
}
} }
} }
worldCount++; worldCount++;

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

@ -63,7 +63,12 @@ public final class EntitySpawn implements Listener {
if (worldEntityCount > MAX_ENTITIES_PER_WORLD) { if (worldEntityCount > MAX_ENTITIES_PER_WORLD) {
for (Entity entity : world.getEntities()) { for (Entity entity : world.getEntities()) {
if (!EntityType.PLAYER.equals(entity.getType())) { if (!EntityType.PLAYER.equals(entity.getType())) {
try {
entity.remove(); entity.remove();
} catch (Exception ignored) {
// Broken entity
continue;
}
} }
} }
return true; return true;