Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-23 12:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

These somehow were undone at some point

Browse Source
This commit is contained in:
boy0001 2014-11-11 13:23:45 +11:00
parent c9204b3590
commit e6c5f824df
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PlotSquared/src/main/java/com/intellectualcrafters/plot/Plot.java
View File

@ -22,6 +22,7 @@
package com.intellectualcrafters.plot;
import com.intellectualcrafters.plot.database.DBFunc;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.block.Biome;
@ -285,6 +286,21 @@ public class Plot implements Cloneable {
public void clear(final Player plr) {
PlotHelper.clear(plr, this);
}
@Override
public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
final Plot other = (Plot) obj;
return ((this.id.x.equals(other.id.x)) && (this.id.y.equals(other.id.y)) && (this.world.equals(other.world)));
}
/**
* Get the plot hashcode

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotId.java
View File

@ -75,7 +75,7 @@ public class PlotId {
return false;
}
final PlotId other = (PlotId) obj;
return ((this.x == other.x) && (this.y == other.y));
return ((this.x.equals(other.x)) && (this.y.equals(other.y)));
}
@Override