From a9bdc384b97bc12f8497513a915a56c7e9b95789 Mon Sep 17 00:00:00 2001 From: Tschipp Date: Sat, 4 Nov 2017 11:22:13 +0100 Subject: [PATCH] 1.10 ItemStack crashes... --- .../tschipp/carryon/client/event/RenderEntityEvents.java | 6 +++--- .../java/tschipp/carryon/client/event/RenderEvents.java | 2 +- .../tschipp/carryon/common/event/ItemEntityEvents.java | 2 +- .../java/tschipp/carryon/common/event/ItemEvents.java | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java index a6ed2fb..a7d0114 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java @@ -49,7 +49,7 @@ public class RenderEntityEvents if (event.getDwheel() > 0 || event.getDwheel() < 0 || Minecraft.getMinecraft().gameSettings.keyBindPickBlock.isPressed()) { ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand(); - if (stack != null && stack.getItem() == RegistrationHandler.itemEntity) + if (stack == null ? false : (stack.getItem() == RegistrationHandler.itemEntity)) { if (ItemEntity.hasEntityData(stack)) { @@ -94,7 +94,7 @@ public class RenderEntityEvents field.setAccessible(true); ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand(); EntityPlayer player = Minecraft.getMinecraft().thePlayer; - if (stack != null ? stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack) : false) + if (stack != null ? (stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack)) : false) { if (settings.keyBindDrop.isPressed()) { @@ -136,7 +136,7 @@ public class RenderEntityEvents int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; float partialticks = event.getPartialTicks(); - if (stack != null ? stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack) : false) + if (stack != null ? (stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack)) : false) { Entity entity = ItemEntity.getEntity(stack, world); diff --git a/src/main/java/tschipp/carryon/client/event/RenderEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEvents.java index e08995f..94da966 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEvents.java @@ -71,7 +71,7 @@ public class RenderEvents if (event.getDwheel() > 0 || event.getDwheel() < 0 || Minecraft.getMinecraft().gameSettings.keyBindPickBlock.isPressed()) { ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand(); - if (stack != null && stack.getItem() == RegistrationHandler.itemTile) + if (stack == null ? false : stack.getItem() == RegistrationHandler.itemTile) { if (ItemTile.hasTileData(stack)) { diff --git a/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java index 0eabe4a..ab6803f 100644 --- a/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java +++ b/src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java @@ -38,7 +38,7 @@ public class ItemEntityEvents { EntityPlayer player = event.getEntityPlayer(); ItemStack stack = player.getHeldItemMainhand(); - if (stack != null && stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack)) + if (stack == null ? false : (stack.getItem() == RegistrationHandler.itemEntity && ItemEntity.hasEntityData(stack))) { player.getEntityData().removeTag("carrySlot"); event.setUseBlock(Result.DENY); diff --git a/src/main/java/tschipp/carryon/common/event/ItemEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEvents.java index 03c7af0..b833cdf 100644 --- a/src/main/java/tschipp/carryon/common/event/ItemEvents.java +++ b/src/main/java/tschipp/carryon/common/event/ItemEvents.java @@ -45,7 +45,7 @@ public class ItemEvents { EntityPlayer player = event.getEntityPlayer(); ItemStack stack = player.getHeldItemMainhand(); - if (stack != null && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack)) + if (stack == null ? false : (stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack))) { player.getEntityData().removeTag("carrySlot"); event.setUseBlock(Result.DENY); @@ -103,7 +103,7 @@ public class ItemEvents World world = player.getEntityWorld(); ItemStack carried = player.getHeldItemMainhand(); - if (carried != null && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity) + if (carried == null ? false : (carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)) { if (carried.getItem() == RegistrationHandler.itemTile) { @@ -139,7 +139,7 @@ public class ItemEvents World world = player.getEntityWorld(); ItemStack carried = player.getHeldItemMainhand(); - if (carried != null && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity) + if (carried == null ? false : (carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)) { if (carried.getItem() == RegistrationHandler.itemTile) { @@ -170,7 +170,7 @@ public class ItemEvents if(player != null) { ItemStack stack = player.getHeldItemMainhand(); - if(stack != null && (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity)) + if(stack == null ? false : (stack.getItem() == RegistrationHandler.itemTile || stack.getItem() == RegistrationHandler.itemEntity)) event.setNewSpeed(0); } }