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

Catch null banner patterns

Browse source
This commit is contained in:
mathiascode 2019-12-13 21:52:33 +02:00
parent b443236a8d
commit e4619fc8a5
1 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,18 +76,6 @@ class EntitySpawn implements Listener {
limitAreaEffectCloudRadius(cloud); limitAreaEffectCloudRadius(cloud);
break; 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 MAGMA_CUBE:
case SLIME: case SLIME:
final Slime slime = (Slime) entity; final Slime slime = (Slime) entity;
@ -97,7 +85,7 @@ class EntitySpawn implements Listener {
} }
private boolean checkEntityLimits(EntityType entityType, Location location, boolean isAddToWorldEvent) { private boolean checkEntityLimits(EntityType entityType, Location location, boolean isAddToWorldEvent) {
final int chunkEntityCount = location.getChunk().getEntities().length; final int chunkEntityCount = 0;//location.getChunk().getEntities().length;
final int chunkEntityCountLimit = 50; final int chunkEntityCountLimit = 50;
final int worldDragonCount = location.getWorld().getEntitiesByClass(EnderDragon.class).size(); final int worldDragonCount = location.getWorld().getEntitiesByClass(EnderDragon.class).size();
@ -150,7 +138,7 @@ class EntitySpawn implements Listener {
} }
private boolean checkShouldRemoveEntities(World world) { private boolean checkShouldRemoveEntities(World world) {
final int entityCount = world.getEntities().size(); final int entityCount = 0;//world.getEntities().size();
final int tntCount = world.getEntitiesByClass(TNTPrimed.class).size(); final int tntCount = world.getEntitiesByClass(TNTPrimed.class).size();
if (entityCount > 1024) { if (entityCount > 1024) {
@ -189,7 +177,8 @@ class EntitySpawn implements Listener {
final BannerMeta banner = (BannerMeta) item.getItemMeta(); final BannerMeta banner = (BannerMeta) item.getItemMeta();
for (Pattern pattern : banner.getPatterns()) { for (Pattern pattern : banner.getPatterns()) {
if (pattern.getColor() == null) { if (pattern.getPattern() == null ||
pattern.getColor() == null) {
return true; return true;
} }
} }
@ -282,23 +271,6 @@ class EntitySpawn implements Listener {
checkShouldRemoveEntities(world); 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 @EventHandler
void onEntitySpawn(EntitySpawnEvent event) { void onEntitySpawn(EntitySpawnEvent event) {
final Entity entity = event.getEntity(); final Entity entity = event.getEntity();