Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-08-25 23:12:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Default, default flags

Browse Source
This commit is contained in:
Jesse Boyd 2015-11-15 19:56:32 +11:00
parent 9218147aa0
commit 27d1ba810b
5 changed files with 55 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -8,7 +8,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<artifactId>PlotSquared</artifactId> <artifactId>PlotSquared</artifactId>
<version>3.2.17</version> <version>3.2.18</version>
<name>PlotSquared</name> <name>PlotSquared</name>
<packaging>jar</packaging> <packaging>jar</packaging>
<build> <build>

3
src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
View File

@ -275,6 +275,9 @@ public abstract class PlotWorld {
config.set(option, options.get(option)); config.set(option, options.get(option));
} }
} }
if (!config.contains("flags")) {
config.set("flags.use", "63,64,68,69,71,77,96,143,167,193,194,195,196,197,77,143,69,70,72,147,148,107,183,184,185,186,187,132");
}
} }
/** /**

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

@ -128,7 +128,7 @@ import com.plotsquared.bukkit.util.BukkitUtil;
* Player Events involving plots * Player Events involving plots
* *
*/ */
@SuppressWarnings({ "unused", "deprecation", "unchecked" }) @SuppressWarnings({ "deprecation", "unchecked" })
public class PlayerEvents extends com.plotsquared.listener.PlotListener implements Listener { public class PlayerEvents extends com.plotsquared.listener.PlotListener implements Listener {
private boolean pistonBlocks = true; private boolean pistonBlocks = true;
@ -315,11 +315,11 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
public void PlayerCommand(final PlayerCommandPreprocessEvent event) { public void PlayerCommand(final PlayerCommandPreprocessEvent event) {
final String message = event.getMessage().toLowerCase().replaceAll("/", "").trim(); String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
if (message.length() == 0) { if (msg.length() == 0) {
return; return;
} }
final String[] split = message.split(" "); final String[] split = msg.split(" ");
final PluginCommand cmd = Bukkit.getServer().getPluginCommand(split[0]); final PluginCommand cmd = Bukkit.getServer().getPluginCommand(split[0]);
if (cmd == null) { if (cmd == null) {
if (split[0].equals("plotme") || split[0].equals("ap")) { if (split[0].equals("plotme") || split[0].equals("ap")) {
@ -330,78 +330,65 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.NOT_USING_PLOTME); MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.NOT_USING_PLOTME);
} }
event.setCancelled(true); event.setCancelled(true);
return;
} }
} }
final Player player = event.getPlayer(); final Player player = event.getPlayer();
final PlotPlayer pp = BukkitUtil.getPlayer(player); final PlotPlayer pp = BukkitUtil.getPlayer(player);
pp.getLocation(); Plot plot = pp.getCurrentPlot();
if (!PS.get().isPlotWorld(BukkitUtil.getWorld(player))) {
return;
}
final Plot plot = MainUtil.getPlot(BukkitUtil.getLocation(player));
if (plot == null) { if (plot == null) {
return; return;
} }
Flag flag = FlagManager.getPlotFlagRaw(plot, "blocked-cmds");
Flag flag; if (flag == null || Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
if (((flag = FlagManager.getPlotFlagRaw(plot, "blocked-cmds")) != null) && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) { return;
final List<String> v = (List<String>) flag.getValue(); }
final List<String> v = (List<String>) flag.getValue();
String msg = event.getMessage().toLowerCase().replaceFirst("/", ""); final String[] parts = msg.split(" ");
String c = parts[0];
final String[] parts = msg.split(" "); if (parts[0].contains(":")) {
String c = parts[0]; c = parts[0].split(":")[1];
if (parts[0].contains(":")) { msg = msg.replace(parts[0].split(":")[0] + ":", "");
c = parts[0].split(":")[1]; }
msg = msg.replace(parts[0].split(":")[0] + ":", ""); final String l = c;
final List<String> aliases = new ArrayList<>();
for (final HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
if (c.equals(cmdLabel.getName())) {
break;
} }
PluginCommand p;
final String l = c; final String label = cmdLabel.getName().replaceFirst("/", "");
if (aliases.contains(label)) {
final List<String> aliases = new ArrayList<>(); continue;
}
for (final HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) { if ((p = Bukkit.getPluginCommand(label)) != null) {
if (c.equals(cmdLabel.getName())) { for (String a : p.getAliases()) {
break; if (aliases.contains(a)) {
} continue;
PluginCommand p; }
final String label = cmdLabel.getName().replaceFirst("/", ""); aliases.add(a);
if (aliases.contains(label)) { a = a.replaceFirst("/", "");
continue; if (!a.equals(label) && a.equals(c)) {
} c = label;
if ((p = Bukkit.getPluginCommand(label)) != null) { break;
for (String a : p.getAliases()) {
if (aliases.contains(a)) {
continue;
}
aliases.add(a);
a = a.replaceFirst("/", "");
if (!a.equals(label) && a.equals(c)) {
c = label;
break;
}
} }
} }
} }
}
if (!l.equals(c)) { if (!l.equals(c)) {
msg = msg.replace(l, c); msg = msg.replace(l, c);
}
for (final String s : v) {
Pattern pattern;
if (!RegExUtil.compiledPatterns.containsKey(s)) {
RegExUtil.compiledPatterns.put(s, ((pattern = Pattern.compile(s))));
} else {
pattern = RegExUtil.compiledPatterns.get(s);
} }
if (pattern.matcher(msg).matches()) {
for (final String s : v) { MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
Pattern pattern; event.setCancelled(true);
if (!RegExUtil.compiledPatterns.containsKey(s)) { return;
RegExUtil.compiledPatterns.put(s, ((pattern = Pattern.compile(s))));
} else {
pattern = RegExUtil.compiledPatterns.get(s);
}
if (pattern.matcher(msg).matches()) {
MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
event.setCancelled(true);
return;
}
} }
} }
} }

2
src/main/java/com/plotsquared/listener/PlotListener.java
View File

@ -227,9 +227,7 @@ public class PlotListener {
pp.setFlight(false); pp.setFlight(false);
} }
} }
System.out.print("CHECKING TIME");
if (FlagManager.getPlotFlagRaw(plot, "time") != null) { if (FlagManager.getPlotFlagRaw(plot, "time") != null) {
System.out.print("RESETTING TIEM");
pp.setTime(Long.MAX_VALUE); pp.setTime(Long.MAX_VALUE);
} }
if (FlagManager.getPlotFlagRaw(plot, "weather") != null) { if (FlagManager.getPlotFlagRaw(plot, "weather") != null) {

BIN
target/PlotSquared-Bukkit.jar
View File

Binary file not shown.