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

Add world parameter to EconHandler permission checks

Browse Source 
Fixes #595
This commit is contained in:
boy0001
2015-09-01 14:02:37 +10:00
parent f22874970f
commit 6006b0e011
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,16 @@ 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(String player, String perm, boolean value);
public abstract boolean hasPermission(String player, String perm);
public void setPermission(String player, String perm, boolean value) {
setPermission(null, player, perm, value);
}
public abstract void setPermission(String world, String player, String perm, boolean value);
public abstract boolean hasPermission(String world, String player, String perm);
public boolean hasPermission(String player, String perm) {
return hasPermission(null, player, perm);
}
}

10
src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
View File

@@ -78,17 +78,17 @@ public class BukkitEconHandler extends EconHandler {
}
@Override
public void setPermission(String player, String perm, boolean value) {
public void setPermission(String world, String player, String perm, boolean value) {
if (value) {
perms.playerAdd((World) null, player, perm);
perms.playerAdd(world, player, perm);
}
else {
perms.playerRemove((World) null, player, perm);
perms.playerRemove(world, player, perm);
}
}
@Override
public boolean hasPermission(String player, String perm) {
return perms.playerHas((String) null, Bukkit.getOfflinePlayer(player), perm);
public boolean hasPermission(String world, String player, String perm) {
return perms.playerHas(world, Bukkit.getOfflinePlayer(player), perm);
}
}