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

1.10 changes

Browse Source
This commit is contained in:
Tschipp 2017-10-07 18:19:21 +02:00
parent 32a837eb39
commit 592bee78b8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,7 @@ public class ItemEvents
World world = player.getEntityWorld();
ItemStack carried = player.getHeldItemMainhand();
if (!carried.isEmpty() && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)
if (carried != null && 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.isEmpty() && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)
if (carried != null && carried.getItem() == RegistrationHandler.itemTile || carried.getItem() == RegistrationHandler.itemEntity)
{
if (carried.getItem() == RegistrationHandler.itemTile)
{

2
src/main/java/tschipp/carryon/network/client/CarrySlotPacketHandler.java
View File

@ -21,7 +21,7 @@ public class CarrySlotPacketHandler implements IMessageHandler<CarrySlotPacket,
mainThread.addScheduledTask(new Runnable()
{
World world = Minecraft.getMinecraft().world;
World world = Minecraft.getMinecraft().theWorld;
@Override
public void run()

2
src/main/java/tschipp/carryon/network/client/ScriptReloadPacketHandler.java
View File

@ -18,7 +18,7 @@ public class ScriptReloadPacketHandler implements IMessageHandler<ScriptReloadPa
mainThread.addScheduledTask(new Runnable()
{
EntityPlayerSP player = Minecraft.getMinecraft().player;
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
@Override
public void run()