From 59deb840b072df28ff8c9d5c39c7cfd48e4a997c Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Fri, 26 Aug 2016 23:03:37 +1000
Subject: % Final work to UUID and PlayerCache.dat handling. $ Fixes a rare
 bug, allowing the wrong players to open locked containers.

---
 src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java     |  3 +--
 .../base/machines/GregtechMetaSafeBlockBase.java         | 16 ++++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/Java/miscutil/core/xmod/gregtech')

diff --git a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
index 211e120247..6c3d871d33 100644
--- a/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/miscutil/core/xmod/gregtech/HANDLER_GT.java
@@ -4,7 +4,6 @@ import gregtech.api.util.GT_Config;
 import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import miscutil.core.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
 import miscutil.core.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
-import miscutil.core.xmod.gregtech.loaders.Processing_HotIngots;
 
 public class HANDLER_GT {
 	
@@ -20,7 +19,7 @@ public class HANDLER_GT {
 			//new Processing_Plate1();
 			//new Processing_Block();
 		}
-		new Processing_HotIngots();
+		//new Processing_HotIngots();
 	}
 	
 	public static void init(){
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
index d9d69dc294..991f1b5d6e 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/base/machines/GregtechMetaSafeBlockBase.java
@@ -192,15 +192,19 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
 		}
 		if (!aPlayer.equals(null)) {
 			UUID tempUUID = aPlayer.getUniqueID();
-			PlayerCache.appendParamChanges(aPlayer.getDisplayName(), aPlayer.getUniqueID().toString());
-			if (ownerUUID.equals("")){
-				Utils.LOG_WARNING("No owner yet for this block.");
+			/*if (!aPlayer.worldObj.isRemote){
+			//PlayerCache.appendParamChanges(aPlayer.getDisplayName(), aPlayer.getUniqueID().toString());
+			}*/
+			//Utils.LOG_INFO("test");
+			if (ownerUUID == null){
+				Utils.LOG_INFO("No owner yet for this block.");
 			}
 			else {
-				Utils.LOG_WARNING("Current Owner: "+PlayerCache.lookupPlayerByUUID(ownerUUID)+" - UUID: "+ownerUUID);
+				//Utils.LOG_INFO("test");
+				Utils.LOG_INFO("Current Owner: "+PlayerCache.lookupPlayerByUUID(ownerUUID)+" - UUID: "+ownerUUID);
 			}
 			Utils.LOG_WARNING("Is ownerUUID Null");
-			if (ownerUUID.equals("")){
+			if (ownerUUID == null){
 				Utils.LOG_WARNING("OwnerUUID is Null, let's set it.");
 				Utils.LOG_WARNING("Accessing Players UUID is: "+tempUUID);
 				ownerUUID = tempUUID;
@@ -209,7 +213,7 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
 			}
 			Utils.LOG_WARNING("No, it is not.");
 			Utils.LOG_WARNING("Checking ownerUUID.");
-			if (!ownerUUID.equals(null)){
+			if (ownerUUID != null){
 				Utils.LOG_WARNING("ownerUUID != Null, if accessor == owner.");
 				Utils.LOG_WARNING("Accessing is: "+PlayerCache.lookupPlayerByUUID(tempUUID));
 				if (ownerUUID.equals(tempUUID)){
-- 
cgit