aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-10 16:28:11 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-10 16:28:11 +0000
commita6753414a126d48a4615288d1f0e907ad524c54d (patch)
treec61bdc53c44924310de57ef628660c900c232480 /src/Java/gtPlusPlus/core
parent63e94d2dda9495c5894f942902a76c0c17871381 (diff)
downloadGT5-Unofficial-a6753414a126d48a4615288d1f0e907ad524c54d.tar.gz
GT5-Unofficial-a6753414a126d48a4615288d1f0e907ad524c54d.tar.bz2
GT5-Unofficial-a6753414a126d48a4615288d1f0e907ad524c54d.zip
+ Added ASM to log/patch misuses of EntityLivingBase.setHealth().
$ Fixed getItemStackInPlayersHand() being Server Sided only.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
index 4b579e84d2..9a8a8e691c 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/PlayerUtils.java
@@ -1,10 +1,13 @@
package gtPlusPlus.core.util.minecraft;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-
+import gtPlusPlus.core.util.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -12,8 +15,6 @@ 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 {
@@ -100,7 +101,6 @@ public class PlayerUtils {
return null;
}
- @SideOnly(Side.SERVER)
public static ItemStack getItemStackInPlayersHand(final EntityPlayer player){
ItemStack heldItem = null;
try{