EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-29 04:04:43 +02:00
Code Issues Projects Releases Wiki Activity

Permission stuff

Browse Source
This commit is contained in:
boy0001
2015-08-02 06:11:28 +10:00
parent e314f46c47
commit 4acf88e09d
8 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/intellectualcrafters/plot/util/EconHandler.java
View File

@ -16,7 +16,6 @@ public abstract class EconHandler {
public abstract void withdrawMoney(PlotPlayer player, double amount);
public abstract void depositMoney(PlotPlayer player, double amount);
public abstract void depositMoney(OfflinePlotPlayer player, double amount);
public abstract void setPermission(PlotPlayer player, String perm, boolean value);
// public abstract void setPermission(OfflinePlotPlayer player, String perm, boolean value);
// public abstract void getPermission(OfflinePlotPlayer player, String perm);
public abstract void setPermission(String player, String perm, boolean value);
public abstract boolean hasPermission(String player, String perm);
}

12
src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -635,6 +635,15 @@ public class MainUtil {
}
manager.startPlotMerge(plotworld, plotIds);
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
final PlotId id = new PlotId(x, y);
final Plot plot = PS.get().getPlots(world).get(id);
if (removeRoads) {
removeSign(plot);
}
}
}
for (int x = pos1.x; x <= pos2.x; x++) {
for (int y = pos1.y; y <= pos2.y; y++) {
final boolean lx = x < pos2.x;
@ -642,9 +651,6 @@ public class MainUtil {
final PlotId id = new PlotId(x, y);
final Plot plot = PS.get().getPlots(world).get(id);
Plot plot2 = null;
if (removeRoads) {
removeSign(plot);
}
if (lx) {
if (ly) {
if (!plot.getSettings().getMerged(1) || !plot.getSettings().getMerged(2)) {