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

Spawner check changes

Browse source
This commit is contained in:
mathiascode 2019-12-15 20:26:01 +02:00
parent d805770131
commit f3ce40261f
1 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -202,13 +202,14 @@ class EntitySpawn implements Listener {
}
private void limitSpawner(CreatureSpawner spawner) {
if (spawner.getSpawnedType() == EntityType.FALLING_BLOCK) {
if (spawner.getDelay() > 100) {
if (spawner.getSpawnedType() == EntityType.MINECART_MOB_SPAWNER) {
spawner.setSpawnedType(EntityType.MINECART);
} else if (spawner.getSpawnedType() == EntityType.FALLING_BLOCK &&
spawner.getDelay() > 100) {
spawner.setMaxSpawnDelay(100);
spawner.setDelay(100);
spawner.update();
}
}
if (spawner.getSpawnCount() > 200) {
spawner.setSpawnCount(200);
@ -298,14 +299,7 @@ class EntitySpawn implements Listener {
@EventHandler
void onPreSpawnerSpawn(PreSpawnerSpawnEvent event) {
try {
final CreatureSpawner spawner = (CreatureSpawner) event.getSpawnerLocation().getBlock().getState();
if (spawner.getSpawnedType() == EntityType.MINECART_MOB_SPAWNER) {
event.setCancelled(true);
return;
}
limitSpawner(spawner);
limitSpawner((CreatureSpawner) event.getSpawnerLocation().getBlock().getState());
} catch (Exception exception) {
event.setCancelled(true);
}
@ -313,11 +307,10 @@ class EntitySpawn implements Listener {
@EventHandler
void onSpawnerSpawn(SpawnerSpawnEvent event) {
if (event.getEntity().getType() == EntityType.FALLING_BLOCK) {
final FallingBlock block = (FallingBlock) event.getEntity();
if (block.getBlockData().getMaterial() == Material.SPAWNER) {
if (event.getEntityType() == EntityType.FALLING_BLOCK) {
if (((FallingBlock) event.getEntity()).getBlockData().getMaterial() == Material.SPAWNER) {
event.setCancelled(true);
event.getSpawner().setSpawnedType(EntityType.FALLING_BLOCK);
}
}
}