Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-09-28 04:17:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed for worldguard 6 + fixes

Browse Source 
- Improved plot perm checking (faster)
- Added toString() method for PlotId
- Fixed WorldGuard listener for WG 6
This commit is contained in:
boy0001 2014-09-25 14:58:34 +10:00
parent 26249d00a3
commit f331b1abaa
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PlotSquared/src/com/intellectualcrafters/plot/PlayerFunctions.java
View File

@ -195,15 +195,12 @@ public class PlayerFunctions {
if (p.hasPermission("plots.admin")) { if (p.hasPermission("plots.admin")) {
return Integer.MAX_VALUE; return Integer.MAX_VALUE;
} }
int y = 0; for (int x = 0; x <= 100; x++) {
for (int x = 1; x <= 100; x++) { if (p.hasPermission("plots.plot." + (100-x))) {
if (p.hasPermission("plots.plot." + x)) { return 100-x;
y = x;
} else {
break;
} }
} }
return y; return 0;
} }
/** /**

5
PlotSquared/src/com/intellectualcrafters/plot/PlotId.java
View File

@ -23,6 +23,11 @@ public class PlotId {
PlotId other = (PlotId) obj; PlotId other = (PlotId) obj;
return ((this.x == other.x) && (this.y == other.y)); return ((this.x == other.x) && (this.y == other.y));
} }
@Override
public String toString() {
return this.x+";"+this.y;
}
@Override @Override
public int hashCode() { public int hashCode() {

4
PlotSquared/src/com/intellectualcrafters/plot/listeners/WorldGuardListener.java
View File

@ -41,7 +41,7 @@ public class WorldGuardListener implements Listener {
BlockVector vector1 = new BlockVector(location1.getBlockX(), 1, location1.getBlockZ()); BlockVector vector1 = new BlockVector(location1.getBlockX(), 1, location1.getBlockZ());
BlockVector vector2 = new BlockVector(location2.getBlockX(), plot.getWorld().getMaxHeight(), location2.getBlockZ()); BlockVector vector2 = new BlockVector(location2.getBlockX(), plot.getWorld().getMaxHeight(), location2.getBlockZ());
ProtectedRegion region = new ProtectedCuboidRegion(plot.getId().x + ";" + plot.getId().y, vector1, vector2); ProtectedRegion region = new ProtectedCuboidRegion(plot.getId().x + "-" + plot.getId().y, vector1, vector2);
DefaultDomain owner = new DefaultDomain(); DefaultDomain owner = new DefaultDomain();
owner.addPlayer(PlotMain.worldGuard.wrapPlayer(player)); owner.addPlayer(PlotMain.worldGuard.wrapPlayer(player));
@ -57,6 +57,6 @@ public class WorldGuardListener implements Listener {
World world = Bukkit.getWorld(event.getWorld()); World world = Bukkit.getWorld(event.getWorld());
RegionManager manager = PlotMain.worldGuard.getRegionManager(world); RegionManager manager = PlotMain.worldGuard.getRegionManager(world);
manager.removeRegion(plot.x + ";" + plot.y); manager.removeRegion(plot.x + "-" + plot.y);
} }
} }