mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
made despawn protection time configurable, set default to the (per comment) intended 2 minutes
This commit is contained in:
1 parent
d6d32becc9
commit
e79f012a87
3 files changed
+6
-3
No files matched your search
@@ -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,
|
||||
|
||||
@@ -193,7 +193,7 @@ public class BlockPoweredSpawner extends AbstractMachineBlock<TilePoweredSpawner
|
||||
|
||||
long spawnTime = ent.getEntityData().getLong(KEY_SPAWNED_BY_POWERED_SPAWNER);
|
||||
long livedFor = livingUpdate.entity.worldObj.getTotalWorldTime() - spawnTime;
|
||||
if(livedFor > 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);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user