R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.10 ItemStack crashes...

Browse Source
This commit is contained in:
Tschipp 2017-11-04 11:22:13 +01:00
parent f3a3843dc8
commit a9bdc384b9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/tschipp/carryon/client/event/RenderEntityEvents.java
View File

@ -49,7 +49,7 @@ public class RenderEntityEvents
if (event.getDwheel() > 0 || event.getDwheel() < 0 || Minecraft.getMinecraft().gameSettings.keyBindPickBlock.isPressed()) if (event.getDwheel() > 0 || event.getDwheel() < 0 || Minecraft.getMinecraft().gameSettings.keyBindPickBlock.isPressed())
{ {
ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand(); 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)) if (ItemEntity.hasEntityData(stack))
{ {
@ -94,7 +94,7 @@ public class RenderEntityEvents
field.setAccessible(true); field.setAccessible(true);
ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand(); ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand();
EntityPlayer player = Minecraft.getMinecraft().thePlayer; 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()) if (settings.keyBindDrop.isPressed())
{ {
@ -136,7 +136,7 @@ public class RenderEntityEvents
int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView;
float partialticks = event.getPartialTicks(); 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); Entity entity = ItemEntity.getEntity(stack, world);

2
src/main/java/tschipp/carryon/client/event/RenderEvents.java
View File

@ -71,7 +71,7 @@ public class RenderEvents
if (event.getDwheel() > 0 || event.getDwheel() < 0 || Minecraft.getMinecraft().gameSettings.keyBindPickBlock.isPressed()) if (event.getDwheel() > 0 || event.getDwheel() < 0 || Minecraft.getMinecraft().gameSettings.keyBindPickBlock.isPressed())
{ {
ItemStack stack = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand(); 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)) if (ItemTile.hasTileData(stack))
{ {

2
src/main/java/tschipp/carryon/common/event/ItemEntityEvents.java
View File

@ -38,7 +38,7 @@ public class ItemEntityEvents
{ {
EntityPlayer player = event.getEntityPlayer(); EntityPlayer player = event.getEntityPlayer();
ItemStack stack = player.getHeldItemMainhand(); 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"); player.getEntityData().removeTag("carrySlot");
event.setUseBlock(Result.DENY); event.setUseBlock(Result.DENY);

8
src/main/java/tschipp/carryon/common/event/ItemEvents.java
View File

@ -45,7 +45,7 @@ public class ItemEvents
{ {
EntityPlayer player = event.getEntityPlayer(); EntityPlayer player = event.getEntityPlayer();
ItemStack stack = player.getHeldItemMainhand(); 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"); player.getEntityData().removeTag("carrySlot");
event.setUseBlock(Result.DENY); event.setUseBlock(Result.DENY);
@ -103,7 +103,7 @@ public class ItemEvents
World world = player.getEntityWorld(); World world = player.getEntityWorld();
ItemStack carried = player.getHeldItemMainhand(); 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) if (carried.getItem() == RegistrationHandler.itemTile)
{ {
@ -139,7 +139,7 @@ public class ItemEvents
World world = player.getEntityWorld(); World world = player.getEntityWorld();
ItemStack carried = player.getHeldItemMainhand(); 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) if (carried.getItem() == RegistrationHandler.itemTile)
{ {
@ -170,7 +170,7 @@ public class ItemEvents
if(player != null) if(player != null)
{ {
ItemStack stack = player.getHeldItemMainhand(); 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); event.setNewSpeed(0);
} }
} }