From e79f012a8788e48904f893fbbe4275c1f7bb9ce9 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 22 Feb 2015 22:30:24 +0100 Subject: [PATCH] made despawn protection time configurable, set default to the (per comment) intended 2 minutes --- src/main/java/crazypants/enderio/config/Config.java | 3 +++ .../enderio/machine/spawner/BlockPoweredSpawner.java | 2 +- .../enderio/machine/spawner/TilePoweredSpawner.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 9c6ec817..9b172485 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -316,6 +316,7 @@ public final class Config { public static int poweredSpawnerLevelTwoPowerPerTickRF = 500; public static int poweredSpawnerLevelThreePowerPerTickRF = 1500; public static int poweredSpawnerMaxPlayerDistance = 0; + public static int poweredSpawnerDespawnTimeSeconds = 120; public static boolean poweredSpawnerUseVanillaSpawChecks = false; public static double brokenSpawnerDropChance = 1; public static String[] brokenSpawnerToolBlacklist = new String[] { @@ -1000,6 +1001,8 @@ public final class Config { "RF per tick for a level 3 spawner").getInt(poweredSpawnerLevelThreePowerPerTickRF); poweredSpawnerMaxPlayerDistance = config.get(sectionSpawner.name, "poweredSpawnerMaxPlayerDistance", poweredSpawnerMaxPlayerDistance, "Max distance of the closest player for the spawner to be active. A zero value will remove the player check").getInt(poweredSpawnerMaxPlayerDistance); + poweredSpawnerDespawnTimeSeconds = config.get(sectionSpawner.name, "poweredSpawnerDespawnTimeSeconds" , poweredSpawnerDespawnTimeSeconds, + "Number of seconds in which spawned entities are protected from despawning").getInt(poweredSpawnerDespawnTimeSeconds); poweredSpawnerUseVanillaSpawChecks = config.get(sectionSpawner.name, "poweredSpawnerUseVanillaSpawChecks", poweredSpawnerUseVanillaSpawChecks, "If true, regular spawn checks such as lighting level and dimension will be made before spawning mobs").getBoolean(poweredSpawnerUseVanillaSpawChecks); brokenSpawnerDropChance = (float) config.get(sectionSpawner.name, "brokenSpawnerDropChance", brokenSpawnerDropChance, diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 548c4151..11c2f647 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -193,7 +193,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock 1200) { //after two minutes stop forcing it to be around + if(livedFor > Config.poweredSpawnerDespawnTimeSeconds*20) { try { fieldpersistenceRequired.setBoolean(livingUpdate.entityLiving, false); ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index cbfb40d8..2fa43a0c 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -74,7 +74,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { return; } String name = logic.getEntityNameToSpawn(); - if(name == NULL_ENTITY_NAME) { + if(NULL_ENTITY_NAME.equals(name)) { return; } ItemStack res = EnderIO.itemSoulVessel.createVesselWithEntityStub(logic.getEntityNameToSpawn()); @@ -378,7 +378,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { Entity createEntity(boolean forceAlive) { Entity ent = EntityList.createEntityByName(getEntityNameToSpawn(), getSpawnerWorld()); - if(forceAlive && MIN_PLAYER_DISTANCE <= 0 && ent instanceof EntityLiving) { + if(forceAlive && MIN_PLAYER_DISTANCE <= 0 && Config.poweredSpawnerDespawnTimeSeconds > 0 && ent instanceof EntityLiving) { ent.getEntityData().setLong(BlockPoweredSpawner.KEY_SPAWNED_BY_POWERED_SPAWNER, getSpawnerWorld().getTotalWorldTime()); ((EntityLiving) ent).func_110163_bv(); }