From 257aa3f91fa08b8adccd78cbdb0079995f79974f Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 24 Aug 2014 18:23:14 +0100 Subject: [PATCH] The Gaia Guardian now can't be spawned if the world is in peaceful, it also despawns in this case. --- .../vazkii/botania/common/entity/EntityDoppleganger.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java b/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java index e5e5ffed4..d930ed519 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/MODSRC/vazkii/botania/common/entity/EntityDoppleganger.java @@ -32,6 +32,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; +import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import vazkii.botania.common.block.ModBlocks; @@ -71,6 +72,9 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa public static boolean spawn(ItemStack par1ItemStack, World par3World, int par4, int par5, int par6) { Block block = par3World.getBlock(par4, par5, par6); if(block == Blocks.beacon && !par3World.isRemote) { + if(par3World.difficultySetting == EnumDifficulty.PEACEFUL) + return false; + for(int[] coords : PYLON_LOCATIONS) { int x = par4 + coords[0]; int y = par5 + coords[1]; @@ -213,6 +217,10 @@ public class EntityDoppleganger extends EntityCreature implements IBossDisplayDa @Override public void onLivingUpdate() { super.onLivingUpdate(); + + if(!worldObj.isRemote && worldObj.difficultySetting == EnumDifficulty.PEACEFUL) + setDead(); + ChunkCoordinates source = getSource(); float range = 32F;