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

Allow passives to drop Will in Peaceful (#711)

Browse source
This commit is contained in:
Nick 2016-04-15 16:46:58 -07:00
parent 0e4e428f0e
commit b2d1b75f49
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/item/soul/ItemSentientSword.java
View file

@ -23,6 +23,7 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
@ -325,7 +326,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
{ {
List<ItemStack> soulList = new ArrayList<ItemStack>(); List<ItemStack> soulList = new ArrayList<ItemStack>();
if (!(killedEntity instanceof EntityMob)) if (killedEntity.worldObj.getDifficulty() != EnumDifficulty.PEACEFUL && !(killedEntity instanceof EntityMob))
{ {
return soulList; return soulList;
} }