From 1f1f6f4bb6b92b242e8b872f4e2444c9ba87ef80 Mon Sep 17 00:00:00 2001 From: Ross Allan Date: Mon, 10 Jun 2013 22:11:05 +0100 Subject: [PATCH] Fix compile error, old prepatched file was allowing it to compile locally when it shouldn't have, as name should be private. Signed-off-by: Ross Allan --- .../me/nallar/patched/nbt/PatchNBTTagCompound.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/me/nallar/patched/nbt/PatchNBTTagCompound.java b/src/common/me/nallar/patched/nbt/PatchNBTTagCompound.java index 8806e39c..40843c54 100644 --- a/src/common/me/nallar/patched/nbt/PatchNBTTagCompound.java +++ b/src/common/me/nallar/patched/nbt/PatchNBTTagCompound.java @@ -147,15 +147,15 @@ public Map getTagMap() { public boolean equals(Object o) { if (o instanceof NBTTagCompound) { - NBTBase var2 = (NBTBase) o; - if (this.getId() == var2.getId() && ((this.name != null || var2.getName() == null) && (this.name == null || var2.getName() != null) && (this.name == null || this.name.equals(var2.getName())))) { + NBTBase other = (NBTBase) o; + if (this.getId() == other.getId() && ((this.getName() != null || other.getName() == null) && (this.getName() == null || other.getName() != null) && (this.getName() == null || this.getName().equals(other.getName())))) { NBTTagCompound nbttagcompound = (NBTTagCompound) o; Map map = tagMap; - Map other = nbttagcompound.getTagMap(); - if (map.size() == other.size()) { + Map otherMap = nbttagcompound.getTagMap(); + if (map.size() == otherMap.size()) { synchronized (this) { for (Map.Entry entry : (Iterable) map.entrySet()) { - if (other.get(entry.getKey()) != entry.getValue()) { + if (otherMap.get(entry.getKey()) != entry.getValue()) { return false; } }