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

Tweaks (perms, debug, scripting)

Browse Source
This commit is contained in:
boy0001
2015-08-11 23:42:46 +10:00
parent 994ca12102
commit b40c464da9
8 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -355,7 +355,7 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
}
Flag flag;
if (!player.hasPermission(PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS) && (flag = FlagManager.getPlotFlag(plot, "blocked-cmds")) != null) {
if (!Permissions.hasPermission(pp, PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS) && (flag = FlagManager.getPlotFlag(plot, "blocked-cmds")) != null) {
List<String> v = (List<String>) flag.getValue();
String msg = event.getMessage().toLowerCase().replaceFirst("/", "");

2
src/main/java/com/plotsquared/bukkit/object/BukkitPlayer.java
View File

@ -85,8 +85,10 @@ public class BukkitPlayer extends PlotPlayer {
return true;
}
if (offline && EconHandler.manager != null) {
System.out.print("CHECKIGN VAULT!");
return EconHandler.manager.hasPermission(getName(), perm);
}
System.out.print("CHECKING: " + perm + " -> " + player.hasPermission(perm));
return this.player.hasPermission(perm);
}

3
src/main/java/com/plotsquared/bukkit/util/BukkitCommand.java
View File

@ -15,6 +15,7 @@ import com.intellectualcrafters.plot.commands.DebugUUID;
import com.intellectualcrafters.plot.commands.MainCommand;
import com.intellectualcrafters.plot.object.ConsolePlayer;
import com.intellectualcrafters.plot.object.PlotPlayer;
import com.intellectualcrafters.plot.util.Permissions;
import com.intellectualcrafters.plot.util.StringComparison;
import com.plotsquared.general.commands.Command;
@ -63,7 +64,7 @@ public class BukkitCommand implements CommandExecutor, TabCompleter {
String label = cmd.getCommand();
if (!label.equalsIgnoreCase(best)) {
if (label.startsWith(arg)) {
if (player.hasPermission(cmd.getPermission())) {
if (Permissions.hasPermission(player, cmd.getPermission())) {
tabOptions.add(cmd.getCommand());
} else if (cmd.getAliases().size() > 0) {
for (String alias : cmd.getAliases()) {