Fix ForgeWorld's equals() being very broken.

This commit is contained in:
sk89q 2014-07-28 20:52:17 -07:00
parent 4d9b3681d7
commit 527a8dd49b

View File

@ -359,7 +359,7 @@ public class ForgeWorld extends AbstractWorld {
} else if ((o instanceof ForgeWorld)) { } else if ((o instanceof ForgeWorld)) {
ForgeWorld other = ((ForgeWorld) o); ForgeWorld other = ((ForgeWorld) o);
World otherWorld = other.worldRef.get(); World otherWorld = other.worldRef.get();
World thisWorld = other.worldRef.get(); World thisWorld = worldRef.get();
return otherWorld != null && thisWorld != null && otherWorld.equals(thisWorld); return otherWorld != null && thisWorld != null && otherWorld.equals(thisWorld);
} else if (o instanceof com.sk89q.worldedit.world.World) { } else if (o instanceof com.sk89q.worldedit.world.World) {
return ((com.sk89q.worldedit.world.World) o).getName().equals(getName()); return ((com.sk89q.worldedit.world.World) o).getName().equals(getName());