Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-27 17:28:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1313 from MinelinkNetwork/blocked-cmds

Browse Source 
Only show blocked-cmds message when event is cancelled
This commit is contained in:
Jesse Boyd 2016-08-17 12:13:27 +10:00 committed by GitHub
commit 6b95e57d9e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,7 +412,6 @@ public class PlayerEvents extends PlotListener implements Listener {
pattern = RegExUtil.compiledPatterns.get(s); pattern = RegExUtil.compiledPatterns.get(s);
} }
if (pattern.matcher(msg).matches()) { if (pattern.matcher(msg).matches()) {
MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
String perm; String perm;
if (plot.isAdded(pp.getUUID())) { if (plot.isAdded(pp.getUUID())) {
perm = "plots.admin.command.blocked-cmds.shared"; perm = "plots.admin.command.blocked-cmds.shared";
@ -420,6 +419,7 @@ public class PlayerEvents extends PlotListener implements Listener {
perm = "plots.admin.command.blocked-cmds.other"; perm = "plots.admin.command.blocked-cmds.other";
} }
if (!Permissions.hasPermission(pp, perm)) { if (!Permissions.hasPermission(pp, perm)) {
MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
event.setCancelled(true); event.setCancelled(true);
} }
return; return;