diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-08-26 23:03:37 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-08-26 23:03:37 +1000 |
| commit | 59deb840b072df28ff8c9d5c39c7cfd48e4a997c (patch) | |
| tree | 221954579e3da3e60013a4ab26065a58f9054243 /src/Java/miscutil/core/handler | |
| parent | 20f3ef5c6b35554118ad395e477b8d263ffbf936 (diff) | |
| download | GT5-Unofficial-59deb840b072df28ff8c9d5c39c7cfd48e4a997c.tar.gz GT5-Unofficial-59deb840b072df28ff8c9d5c39c7cfd48e4a997c.tar.bz2 GT5-Unofficial-59deb840b072df28ff8c9d5c39c7cfd48e4a997c.zip | |
% Final work to UUID and PlayerCache.dat handling.
$ Fixes a rare bug, allowing the wrong players to open locked containers.
Diffstat (limited to 'src/Java/miscutil/core/handler')
| -rw-r--r-- | src/Java/miscutil/core/handler/events/LoginEventHandler.java | 2 | ||||
| -rw-r--r-- | src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Java/miscutil/core/handler/events/LoginEventHandler.java b/src/Java/miscutil/core/handler/events/LoginEventHandler.java index 3efe8cea34..12c8578735 100644 --- a/src/Java/miscutil/core/handler/events/LoginEventHandler.java +++ b/src/Java/miscutil/core/handler/events/LoginEventHandler.java @@ -28,7 +28,9 @@ public class LoginEventHandler { if (localPlayerRef instanceof EntityPlayerMP && localPlayerRef != null){ //Populates player cache + if (!localPlayerRef.worldObj.isRemote){ PlayerCache.appendParamChanges(localPlayersName, localPlayersUUID.toString()); + } /*if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") || localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java index 2445229a11..dff067d9c7 100644 --- a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java +++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java @@ -33,12 +33,15 @@ public class PickaxeBlockBreakEventHandler { if (X instanceof GregtechMetaSafeBlockBase){ UUID ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID; - String accessorUUID = playerInternal.getUniqueID().toString(); + UUID accessorUUID = playerInternal.getUniqueID(); Utils.LOG_WARNING("Owner UUID: "+ownerUUID); Utils.LOG_WARNING("Accessor UUID: "+accessorUUID); if (((GregtechMetaSafeBlockBase)X).bUnbreakable){ - if (accessorUUID.equals(ownerUUID)){ + + Utils.LOG_INFO("UUID info. Accessor: "+accessorUUID + " | Owner: "+ownerUUID); + + if (accessorUUID == ownerUUID){ Utils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed."); event.setCanceled(false); } |