lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Allow Demonic Will to drop from passive mobs in Peaceful (#733)

Browse source 
Goes along with b2d1b75f49 and #711
This commit is contained in:
Nicholas Ignoffo 2016-05-09 16:38:43 -07:00
parent 6cd78757bf
commit 3ce6735920
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
View file

@ -30,6 +30,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.AnvilUpdateEvent; import net.minecraftforge.event.AnvilUpdateEvent;
@ -798,7 +799,7 @@ public class EventHandler
DamageSource source = event.getSource(); DamageSource source = event.getSource();
Entity entity = source.getEntity(); Entity entity = source.getEntity();
if (attackedEntity.isPotionActive(ModPotions.soulSnare) && attackedEntity instanceof EntityMob) if (attackedEntity.isPotionActive(ModPotions.soulSnare) && (attackedEntity instanceof EntityMob || attackedEntity.worldObj.getDifficulty() == EnumDifficulty.PEACEFUL))
{ {
PotionEffect eff = attackedEntity.getActivePotionEffect(ModPotions.soulSnare); PotionEffect eff = attackedEntity.getActivePotionEffect(ModPotions.soulSnare);
int lvl = eff.getAmplifier(); int lvl = eff.getAmplifier();