From 339abedeeed19ab0f0d2ccab7c42d8a3b2cbba70 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Wed, 21 Jun 2017 20:47:03 +0200 Subject: [PATCH] Fix 1.11 Bees do damage on peaceful mode --- .../forestry/apiculture/tiles/TileHive.java | 67 ++++++++++--------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/src/main/java/forestry/apiculture/tiles/TileHive.java b/src/main/java/forestry/apiculture/tiles/TileHive.java index 1c21677a6..c3edaaf6d 100644 --- a/src/main/java/forestry/apiculture/tiles/TileHive.java +++ b/src/main/java/forestry/apiculture/tiles/TileHive.java @@ -10,12 +10,40 @@ ******************************************************************************/ package forestry.apiculture.tiles; +import com.google.common.base.Predicate; + import javax.annotation.Nullable; import java.util.Collections; import java.util.List; -import com.google.common.base.Predicate; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.monster.EntityPigZombie; +import net.minecraft.entity.monster.IMob; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntitySelectors; +import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -44,29 +72,6 @@ import forestry.core.utils.DamageSourceForestry; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.NetworkUtil; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntitySelectors; -import net.minecraft.util.ITickable; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileHive extends TileEntity implements ITickable, IHiveTile, IActivatable, IBeeHousing { private static final DamageSource damageSourceBeeHive = new DamageSourceForestry("bee.hive"); @@ -117,12 +122,14 @@ public class TileHive extends TileEntity implements ITickable, IHiveTile, IActiv if (world.rand.nextInt(angry ? 10 : 200) == 0) { if (calmTime == 0) { if (canWork) { - AxisAlignedBB boundingBox = AlleleEffect.getBounding(getContainedBee().getGenome(), this); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox, beeTargetPredicate); - if (!entities.isEmpty()) { - Collections.shuffle(entities); - EntityLivingBase entity = entities.get(0); - attack(entity, 2); + if(world.getWorldInfo().getDifficulty() != EnumDifficulty.PEACEFUL) { + AxisAlignedBB boundingBox = AlleleEffect.getBounding(getContainedBee().getGenome(), this); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox, beeTargetPredicate); + if (!entities.isEmpty()) { + Collections.shuffle(entities); + EntityLivingBase entity = entities.get(0); + attack(entity, 2); + } } beeLogic.doWork(); }