From 63e94d2dda9495c5894f942902a76c0c17871381 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Thu, 9 Jan 2020 12:46:47 +0000
Subject: $ Fixed Glider Handler using ClientSide code on the Server.

---
 .../gtPlusPlus/core/util/minecraft/PlayerUtils.java    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/util')

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)
-- 
cgit