diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 60762536..8481386d 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -24,6 +24,7 @@ Bugs - #1351 Travel Anchor: Item needs to be added before text is displayed - #1357 Power Conduits replaced by growing tree's - #1361 Enlightened Fused Quartz is not blast resistant +- #1366 Powered Spawners don't remain active with chunk loaders ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java index 8d5bf40c..548c4151 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/BlockPoweredSpawner.java @@ -1,10 +1,13 @@ package crazypants.enderio.machine.spawner; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; import net.minecraft.block.BlockMobSpawner; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,6 +19,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AnvilUpdateEvent; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.BlockEvent.BreakEvent; import cpw.mods.fml.common.FMLCommonHandler; @@ -23,10 +27,12 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; +import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; @@ -68,6 +74,8 @@ public class BlockPoweredSpawner extends AbstractMachineBlock dropQueue = new ArrayList(); private final List toolBlackList = new ArrayList(); + private Field fieldpersistenceRequired; + protected BlockPoweredSpawner() { super(ModObject.blockPoweredSpawner, TilePoweredSpawner.class); @@ -93,6 +103,12 @@ public class BlockPoweredSpawner extends AbstractMachineBlock 1200) { //after two minutes stop forcing it to be around + try { + fieldpersistenceRequired.setBoolean(livingUpdate.entityLiving, false); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } catch (Exception e) { + Log.warn("BlockPoweredSpawner.onLivingUpdate: Error occured allowing entity to despawn: " + e); + ent.getEntityData().removeTag(KEY_SPAWNED_BY_POWERED_SPAWNER); + } + } + } + public boolean isBlackListed(String entityId) { return PoweredSpawnerConfig.getInstance().isBlackListed(entityId); } diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index 22c2368c..4f51421b 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -73,7 +73,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { if(getStackInSlot(0) == null || getStackInSlot(1) != null) { return; } - Entity ent = logic.createEntity(); + Entity ent = logic.createEntity(false); if(ent == null) { return; } @@ -340,7 +340,7 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { for (int i = 0; i < spawnCount; ++i) { - Entity entity = createEntity(); + Entity entity = createEntity(true); if(entity == null) { return; } @@ -375,8 +375,13 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { } } - Entity createEntity() { - return EntityList.createEntityByName(getEntityNameToSpawn(), getSpawnerWorld()); + Entity createEntity(boolean forceAlive) { + Entity ent = EntityList.createEntityByName(getEntityNameToSpawn(), getSpawnerWorld()); + if(forceAlive && MIN_PLAYER_DISTANCE <= 0 && ent instanceof EntityLiving) { + ent.getEntityData().setLong(BlockPoweredSpawner.KEY_SPAWNED_BY_POWERED_SPAWNER, getSpawnerWorld().getTotalWorldTime()); + ((EntityLiving) ent).func_110163_bv(); + } + return ent; } void resetTimer() {