diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 2fb7344a28..4b579e84d2 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -12,7 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; - +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; public class PlayerUtils { @@ -103,15 +103,25 @@ public class PlayerUtils { @SideOnly(Side.SERVER) public static ItemStack getItemStackInPlayersHand(final EntityPlayer player){ ItemStack heldItem = null; - try{heldItem = player.getHeldItem(); - }catch(final NullPointerException e){ + try{ + heldItem = player.getHeldItem(); + } + catch(final NullPointerException e){ e.printStackTrace(); return null; } if (heldItem != null){ return heldItem; } - return null; + else { + if (Utils.isClient()) { + heldItem = player.getItemInUse(); + } + else { + heldItem = player.getCurrentEquippedItem(); + } + } + return heldItem; } @SideOnly(Side.CLIENT) |