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

Fixed client-sided crash in the Blood Light sigil by rearranging a few arguments.

Browse source
This commit is contained in:
WayofTime 2018-03-02 15:21:51 -05:00
parent 4a709157b8
commit 08031e65f8
2 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changelog.txt
View file

@ -1,3 +1,9 @@
------------------------------------------------------
Version 2.2.8
------------------------------------------------------
- Fixed a client side null-pointer exception with the Blood Lamp
- It's a bright idea to fix this as soon as I can.
------------------------------------------------------ ------------------------------------------------------
Version 2.2.7 Version 2.2.7
------------------------------------------------------ ------------------------------------------------------

41
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBloodLight.java
View file

@ -18,19 +18,23 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World; import net.minecraft.world.World;
public class ItemSigilBloodLight extends ItemSigilBase { public class ItemSigilBloodLight extends ItemSigilBase
public ItemSigilBloodLight() { {
public ItemSigilBloodLight()
{
super("blood_light", 10); super("blood_light", 10);
} }
@Override @Override
public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected)
{
if (getCooldownRemainder(stack) > 0) if (getCooldownRemainder(stack) > 0)
reduceCooldown(stack); reduceCooldown(stack);
} }
@Override @Override
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) { public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand)
{
ItemStack stack = player.getHeldItem(hand); ItemStack stack = player.getHeldItem(hand);
if (stack.getItem() instanceof ISigil.Holding) if (stack.getItem() instanceof ISigil.Holding)
stack = ((Holding) stack.getItem()).getHeldItem(stack, player); stack = ((Holding) stack.getItem()).getHeldItem(stack, player);
@ -42,20 +46,27 @@ public class ItemSigilBloodLight extends ItemSigilBase {
if (getCooldownRemainder(stack) > 0) if (getCooldownRemainder(stack) > 0)
return super.onItemRightClick(world, player, hand); return super.onItemRightClick(world, player, hand);
SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack)); if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK)
if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) { {
BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit); BlockPos blockPos = mop.getBlockPos().offset(mop.sideHit);
if (world.isAirBlock(blockPos)) { if (world.isAirBlock(blockPos))
{
world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState()); world.setBlockState(blockPos, RegistrarBloodMagicBlocks.BLOOD_LIGHT.getDefaultState());
if (!world.isRemote) if (!world.isRemote)
{
SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack));
network.syphonAndDamage(player, getLpUsed()); network.syphonAndDamage(player, getLpUsed());
}
resetCooldown(stack); resetCooldown(stack);
player.swingArm(hand); player.swingArm(hand);
return super.onItemRightClick(world, player, hand); return super.onItemRightClick(world, player, hand);
} }
} else { } else
if (!world.isRemote) { {
if (!world.isRemote)
{
SoulNetwork network = NetworkHelper.getSoulNetwork(getBinding(stack));
world.spawnEntity(new EntityBloodLight(world, player)); world.spawnEntity(new EntityBloodLight(world, player));
network.syphonAndDamage(player, getLpUsed()); network.syphonAndDamage(player, getLpUsed());
} }
@ -66,19 +77,23 @@ public class ItemSigilBloodLight extends ItemSigilBase {
} }
@Override @Override
public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) { public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged)
{
return oldStack.getItem() != newStack.getItem(); return oldStack.getItem() != newStack.getItem();
} }
public int getCooldownRemainder(ItemStack stack) { public int getCooldownRemainder(ItemStack stack)
{
return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING); return NBTHelper.checkNBT(stack).getTagCompound().getInteger(Constants.NBT.TICKS_REMAINING);
} }
public void reduceCooldown(ItemStack stack) { public void reduceCooldown(ItemStack stack)
{
NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1); NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, getCooldownRemainder(stack) - 1);
} }
public void resetCooldown(ItemStack stack) { public void resetCooldown(ItemStack stack)
{
NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10); NBTHelper.checkNBT(stack).getTagCompound().setInteger(Constants.NBT.TICKS_REMAINING, 10);
} }
} }