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

Initial stab at 1.11

Browse source 
About halfway.
This commit is contained in:
Nicholas Ignoffo 2016-12-12 19:56:36 -08:00
parent ce52aea512
commit 00d6f8eb46
157 changed files with 1036 additions and 1554 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
View file

@ -197,7 +197,7 @@ public class LivingArmour implements ILivingArmour
continue;
}
if ((world.isRemote && upgrade.runOnClient()) || !world.isRemote)
if (!world.isRemote || upgrade.runOnClient())
{
upgrade.onTick(world, player, this);
}
@ -385,7 +385,7 @@ public class LivingArmour implements ILivingArmour
continue;
}
ItemStack slotStack = player.getItemStackFromSlot(slot);
if (slotStack == null || !(slotStack.getItem() instanceof ItemLivingArmour))
if (slotStack.isEmpty() || !(slotStack.getItem() instanceof ItemLivingArmour))
return false;
}