Default, default flags

pom.xml

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

src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java

@@ -275,6 +275,9 @@ public abstract class PlotWorld {
                 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");
+        }
     }
     
     /**

src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java

@@ -128,7 +128,7 @@ import com.plotsquared.bukkit.util.BukkitUtil;
  * Player Events involving plots
  *
 
-
+
  */
 @SuppressWarnings({ "deprecation", "unchecked" })
 public class PlayerEvents extends com.plotsquared.listener.PlotListener implements Listener {
@@ -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) {
         String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
         if (msg.length() == 0) {
-            return;
+            return;
         }
         final String[] split = msg.split(" ");
         final PluginCommand cmd = Bukkit.getServer().getPluginCommand(split[0]);
@@ -330,38 +330,28 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
                     player.performCommand("plots " + StringMan.join(Arrays.copyOfRange(split, 1, split.length), " "));
                 } else {
                     MainUtil.sendMessage(BukkitUtil.getPlayer(player), C.NOT_USING_PLOTME);
-                }
-                event.setCancelled(true);
-            }
-        }
-        
-        final Player player = event.getPlayer();
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
                 }
                 event.setCancelled(true);
-            return;
+                return;
-        }
+            }
+        }
+        final Player player = event.getPlayer();
         final PlotPlayer pp = BukkitUtil.getPlayer(player);
         Plot plot = pp.getCurrentPlot();
         if (plot == null) {
-            return;
+            return;
-        }
+        }
-        
+        Flag flag = FlagManager.getPlotFlagRaw(plot, "blocked-cmds");
+        if (flag == null || Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
             return;
-        if (((flag = FlagManager.getPlotFlagRaw(plot, "blocked-cmds")) != null) && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-            final List<String> v = (List<String>) flag.getValue();
-            
         }
         final List<String> v = (List<String>) flag.getValue();
         final String[] parts = msg.split(" ");
         String c = parts[0];
         if (parts[0].contains(":")) {
             c = parts[0].split(":")[1];
-                msg = msg.replace(parts[0].split(":")[0] + ":", "");
             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()) {
@@ -385,11 +375,9 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
                         break;
                     }
                 }
-                }
             }
         }
         if (!l.equals(c)) {
-                msg = msg.replace(l, c);
             msg = msg.replace(l, c);
         }
         for (final String s : v) {
@@ -404,7 +392,6 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen
                 event.setCancelled(true);
                 return;
             }
-            }
         }
     }
     

src/main/java/com/plotsquared/listener/PlotListener.java

@@ -227,9 +227,7 @@ public class PlotListener {
                 final PlotGamemode gamemode = pp.getGamemode();
                 if ((gamemode == PlotGamemode.SURVIVAL) || (gamemode == PlotGamemode.ADVENTURE)) {
                     pp.setFlight(false);
-                }
                 }
-            System.out.print("CHECKING TIME");
             }
             if (FlagManager.getPlotFlagRaw(plot, "time") != null) {
                 pp.setTime(Long.MAX_VALUE);