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

Sponge stuff

Browse Source 
Added entity / mob / vehicle / animal / monster caps + entity clearing
on plot clear.
This commit is contained in:
boy0001
2015-08-12 04:04:17 +10:00
parent b40c464da9
commit 7d3de207aa
8 changed files with 223 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java
View File

@ -92,7 +92,14 @@ public class DebugExec extends SubCommand {
File file = new File(PS.get().IMP.getDirectory(), "scripts" + File.separator + "start.js");
if (file.exists()) {
init();
onCommand(ConsolePlayer.getConsole(), new String[] {"run", "start.js"});
try {
String script = StringMan.join(Files.readLines(new File(new File(PS.get().IMP.getDirectory() + File.separator + "scripts"), "start.js"), StandardCharsets.UTF_8), System.getProperty("line.separator"));
scope.put("THIS", this);
scope.put("PlotPlayer", ConsolePlayer.getConsole());
engine.eval(script, scope);
} catch (Exception e) {
e.printStackTrace();
}
}
}
@ -148,7 +155,7 @@ public class DebugExec extends SubCommand {
}
@Override
public boolean onCommand(final PlotPlayer player, String[] args) {
public boolean onCommand(final PlotPlayer player, String... args) {
final List<String> allowed_params = Arrays.asList("calibrate-analysis", "remove-flag", "stop-expire", "start-expire", "show-expired", "update-expired", "seen", "trim-check");
if (args.length > 0) {
final String arg = args[0].toLowerCase();

2
src/main/java/com/intellectualcrafters/plot/commands/list.java
View File

@ -86,7 +86,7 @@ public class list extends SubCommand {
if (Permissions.hasPermission(player, "plots.list.top")) {
args.add("top");
}
if (Permissions.hasPermission(player, "plots.list..all")) {
if (Permissions.hasPermission(player, "plots.list.all")) {
args.add("all");
}
if (Permissions.hasPermission(player, "plots.list.unowned")) {

6
src/main/java/com/intellectualcrafters/plot/util/Permissions.java
View File

@ -39,7 +39,7 @@ public enum Permissions {
if ((player == null) || player.hasPermission(ADMIN.s) || player.hasPermission(STAR.s)) {
return true;
}
if (Permissions.hasPermission(player, perm)) {
if (player.hasPermission(perm)) {
return true;
}
final String[] nodes = perm.split("\\.");
@ -67,11 +67,11 @@ public enum Permissions {
if ((player == null) || player.hasPermission(ADMIN.s) || player.hasPermission(STAR.s)) {
return Integer.MAX_VALUE;
}
if (Permissions.hasPermission(player, stub + ".*")) {
if (player.hasPermission(stub + ".*")) {
return Integer.MAX_VALUE;
}
for (int i = range; i > 0; i--) {
if (Permissions.hasPermission(player, stub + "." + i)) {
if (player.hasPermission(stub + "." + i)) {
return i;
}
}