[maven-release-plugin] prepare release 5.5.3

Set a player's previous gamemode when exiting a gamemode region to the server's default gamemode if there is not a previous gamemode already set

CHANGELOG.txt

@@ -1,3 +1,13 @@
+5.5.3:
+- Added game mode flag.
+- Added item drop pickup flag to regions.
+- Added support for fireball item blocking (385).
+- Added configuration option to allow creature spawns from plugins.
+- Added host key check.
+- Added a new line split feature to region greetings.
+- Prevented commands in the allow commands list from being blocked and
+    vice versa.
+
 5.5.2:
  - Added potion-splash flag to block splash potions
  - Add entity-painting-destroy which can be used to prevent entities from destroying paintings (skeletons firing arrows)

pom.xml

@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sk89q</groupId>
   <artifactId>worldguard</artifactId>
-  <version>5.5.2</version>
+  <version>5.5.3</version>
   <name>WorldGuard</name>
   <description>WorldGuard protects your Minecraft servers</description>
 
@@ -40,14 +40,14 @@
     <dependency>
       <groupId>com.sk89q</groupId>
       <artifactId>worldedit</artifactId>
-      <version>5.3</version>
+      <version>5.4-SNAPSHOT</version>
     </dependency>
 
     <!-- Bukkit -->
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>bukkit</artifactId>
-      <version>1.2.5-R1.0</version>
+      <version>1.2.5-R4.0</version>
     </dependency>
 
     <!-- CommandBook -->

src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java

@@ -97,6 +97,7 @@ public class ConfigurationManager {
     public boolean activityHaltToggle = false;
     public boolean autoGodMode;
     public boolean usePlayerMove;
+    public Map<String, String> hostKeys = new HashMap<String, String>();
 
     /**
      * Region Storage Configuration method, and config values
@@ -119,6 +120,7 @@ public class ConfigurationManager {
     /**
      * Load the configuration.
      */
+    @SuppressWarnings("unchecked")
     public void load() {
         // Create the default configuration file
         plugin.createDefaultConfiguration(
@@ -140,6 +142,18 @@ public class ConfigurationManager {
         config.removeProperty("auto-invincible-permission");
         usePlayerMove = config.getBoolean(
                 "use-player-move-event", true);
+        
+        hostKeys = new HashMap<String, String>();
+        Object hostKeysRaw = config.getProperty("host-keys");
+        if (hostKeysRaw == null || !(hostKeysRaw instanceof Map)) {
+            config.setProperty("host-keys", new HashMap<String, String>());
+        } else {
+            for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) hostKeysRaw).entrySet()) {
+                String key = String.valueOf(entry.getKey());
+                String value = String.valueOf(entry.getValue());
+                hostKeys.put(key.toLowerCase(), value);
+            }
+        }
 
         useSqlDatabase = config.getBoolean(
                 "regions.sql.use", false);

src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java

@@ -36,24 +36,24 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
 /**
  * This processes per-player state information and is also meant to be used
  * as a scheduled task.
- * 
+ *
  * @author sk89q
  */
 public class FlagStateManager implements Runnable {
-    
+
     public static final int RUN_DELAY = 20;
-    
+
     private WorldGuardPlugin plugin;
     private Map<String, PlayerFlagState> states;
-    
+
     /**
      * Construct the object.
-     * 
+     *
      * @param plugin The plugin instance
      */
     public FlagStateManager(WorldGuardPlugin plugin) {
         this.plugin = plugin;
-        
+
         states = new HashMap<String, PlayerFlagState>();
     }
 
@@ -66,16 +66,16 @@ public class FlagStateManager implements Runnable {
 
         for (Player player : players) {
             WorldConfiguration worldConfig = config.get(player.getWorld());
-            
+
             if (!worldConfig.useRegions) {
                 continue;
             }
-            
+
             PlayerFlagState state;
-            
+
             synchronized (this) {
                 state = states.get(player.getName());
-                
+
                 if (state == null) {
                     state = new PlayerFlagState();
                     states.put(player.getName(), state);
@@ -87,7 +87,7 @@ public class FlagStateManager implements Runnable {
                     .get(player.getWorld());
             ApplicableRegionSet applicable = regionManager
                     .getApplicableRegions(playerLocation);
-            
+
             if (!RegionQueryUtil.isInvincible(plugin, player, applicable)
                     && !plugin.getGlobalStateManager().hasGodMode(player)
                     && !(player.getGameMode() == GameMode.CREATIVE)) {
@@ -96,7 +96,7 @@ public class FlagStateManager implements Runnable {
             }
         }
     }
-    
+
     /**
      * Process healing for a player.
      *
@@ -106,18 +106,18 @@ public class FlagStateManager implements Runnable {
      */
     private void processHeal(ApplicableRegionSet applicable, Player player,
             PlayerFlagState state) {
-        
+
         if (player.getHealth() <= 0) {
             return;
         }
-        
+
         long now = System.currentTimeMillis();
 
         Integer healAmount = applicable.getFlag(DefaultFlag.HEAL_AMOUNT);
         Integer healDelay = applicable.getFlag(DefaultFlag.HEAL_DELAY);
         Integer minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
         Integer maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
-        
+
         if (healAmount == null || healDelay == null || healAmount == 0 || healDelay < 0) {
             return;
         }
@@ -127,7 +127,7 @@ public class FlagStateManager implements Runnable {
         if (player.getHealth() >= maxHealth && healAmount > 0) {
             return;
         }
-        
+
         if (healDelay <= 0) {
             player.setHealth(healAmount > 0 ? maxHealth : minHealth); // this will insta-kill if the flag is unset
             state.lastHeal = now;
@@ -137,10 +137,10 @@ public class FlagStateManager implements Runnable {
             state.lastHeal = now;
         }
     }
-    
+
     /**
      * Process restoring hunger for a player.
-     * 
+     *
      * @param applicable The set of applicable regions
      * @param player The player to process hunger flags on
      * @param state The player's state
@@ -154,7 +154,7 @@ public class FlagStateManager implements Runnable {
         Integer feedDelay = applicable.getFlag(DefaultFlag.FEED_DELAY);
         Integer minHunger = applicable.getFlag(DefaultFlag.MIN_FOOD);
         Integer maxHunger = applicable.getFlag(DefaultFlag.MAX_FOOD);
-        
+
         if (feedAmount == null || feedDelay == null || feedAmount == 0 || feedDelay < 0) {
             return;
         }
@@ -177,7 +177,7 @@ public class FlagStateManager implements Runnable {
 
     /**
      * Forget a player.
-     * 
+     *
      * @param player The player to forget
      */
     public synchronized void forget(Player player) {
@@ -194,21 +194,21 @@ public class FlagStateManager implements Runnable {
     /**
      * Get a player's flag state. A new state will be created if there is no existing
      * state for the player.
-     * 
+     *
      * @param player The player to get a state for
      * @return The {@code player}'s state
      */
     public synchronized PlayerFlagState getState(Player player) {
         PlayerFlagState state = states.get(player.getName());
-        
+
         if (state == null) {
             state = new PlayerFlagState();
             states.put(player.getName(), state);
         }
-        
+
         return state;
     }
-    
+
     /**
      * Keeps state per player.
      */
@@ -220,6 +220,7 @@ public class FlagStateManager implements Runnable {
         public Boolean lastExitAllowed = null;
         public Boolean notifiedForLeave = false;
         public Boolean notifiedForEnter = false;
+        public GameMode lastGameMode;
         public World lastWorld;
         public int lastBlockX;
         public int lastBlockY;

src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java

@@ -98,6 +98,7 @@ public class WorldConfiguration {
     public boolean blockFireballExplosions;
     public boolean blockFireballBlockDamage;
     public boolean blockEntityPaintingDestroy;
+    public boolean blockPluginSpawning;
     public boolean disableContactDamage;
     public boolean disableFallDamage;
     public boolean disableLavaDamage;
@@ -315,6 +316,7 @@ public class WorldConfiguration {
         antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
         disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
         blockEntityPaintingDestroy = getBoolean("mobs.block-painting-destroy", false);
+        blockPluginSpawning = getBoolean("mobs.block-plugin-spawning", true);
 
         disableFallDamage = getBoolean("player-damage.disable-fall-damage", false);
         disableLavaDamage = getBoolean("player-damage.disable-lava-damage", false);

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java

@@ -297,7 +297,7 @@ public class WorldGuardBlockListener implements Listener {
             return;
         }
 
-        if (wcfg.blockLighter && cause == IgniteCause.FLINT_AND_STEEL
+        if (wcfg.blockLighter && (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL)
                 && event.getPlayer() != null
                 && !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
             event.setCancelled(true);

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java

@@ -610,6 +610,11 @@ public class WorldGuardEntityListener implements Listener {
         }
 
         WorldConfiguration wcfg = cfg.get(event.getEntity().getWorld());
+
+        // allow spawning of creatures from plugins
+        if (!wcfg.blockPluginSpawning && event.getSpawnReason() == CreatureSpawnEvent.SpawnReason.CUSTOM)
+            return;
+
         EntityType entityType = event.getEntityType();
 
         if (wcfg.blockCreatureSpawn.contains(entityType)) {

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java

@@ -25,6 +25,7 @@ import java.util.Set;
 import com.sk89q.worldedit.blocks.BlockID;
 import com.sk89q.worldedit.blocks.ItemID;
 import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.Block;
@@ -42,9 +43,11 @@ import org.bukkit.event.player.PlayerBucketFillEvent;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerGameModeChangeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
@@ -159,19 +162,24 @@ public class WorldGuardPlayerListener implements Listener {
                     String farewell = set.getFlag(DefaultFlag.FAREWELL_MESSAGE);//, localPlayer);
                     Boolean notifyEnter = set.getFlag(DefaultFlag.NOTIFY_ENTER);//, localPlayer);
                     Boolean notifyLeave = set.getFlag(DefaultFlag.NOTIFY_LEAVE);//, localPlayer);
+                    GameMode gameMode = set.getFlag(DefaultFlag.GAME_MODE);
 
                     if (state.lastFarewell != null && (farewell == null
                             || !state.lastFarewell.equals(farewell))) {
                         String replacedFarewell = plugin.replaceMacros(
                                 player, BukkitUtil.replaceColorMacros(state.lastFarewell));
-                        player.sendMessage(ChatColor.AQUA + " ** " + replacedFarewell);
+                        for (String line : replacedFarewell.split("\n")) {
+                            player.sendMessage(ChatColor.AQUA + " ** " + line);
+                        }
                     }
 
                     if (greeting != null && (state.lastGreeting == null
                             || !state.lastGreeting.equals(greeting))) {
                         String replacedGreeting = plugin.replaceMacros(
                                 player, BukkitUtil.replaceColorMacros(greeting));
-                        player.sendMessage(ChatColor.AQUA + " ** " + replacedGreeting);
+                        for (String line : replacedGreeting.split("\n")) {
+                            player.sendMessage(ChatColor.AQUA + " ** " + line);
+                        }
                     }
 
                     if ((notifyLeave == null || !notifyLeave)
@@ -199,6 +207,21 @@ public class WorldGuardPlayerListener implements Listener {
                                 + regionList);
                     }
 
+                    if (!hasBypass && gameMode != null) {
+                        if (player.getGameMode() != gameMode) {
+                            state.lastGameMode = player.getGameMode();
+                            player.setGameMode(gameMode);
+                        } else if (state.lastGameMode == null) {
+                            state.lastGameMode = player.getServer().getDefaultGameMode();
+                        }
+                    } else {
+                        if (state.lastGameMode != null) {
+                            GameMode mode = state.lastGameMode;
+                            state.lastGameMode = null;
+                            player.setGameMode(mode);
+                        }
+                    }
+
                     state.lastGreeting = greeting;
                     state.lastFarewell = farewell;
                     state.notifiedForEnter = notifyEnter;
@@ -213,6 +236,22 @@ public class WorldGuardPlayerListener implements Listener {
         }
 	}
 
+    @EventHandler
+    public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
+        Player player = event.getPlayer();
+        WorldConfiguration wcfg = plugin.getGlobalStateManager().get(player.getWorld());
+        if (wcfg.useRegions && !plugin.getGlobalRegionManager().hasBypass(player, player.getWorld())) {
+            GameMode gameMode = plugin.getGlobalRegionManager().get(player.getWorld())
+                    .getApplicableRegions(player.getLocation()).getFlag(DefaultFlag.GAME_MODE);
+            if (plugin.getFlagStateManager().getState(player).lastGameMode != null
+                    && gameMode != null && event.getNewGameMode() != gameMode) {
+                event.setCancelled(true);
+                player.sendMessage(ChatColor.RED + "Your game mode is locked to "
+                        + gameMode + "in this region!");
+            }
+        }
+    }
+
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
@@ -286,6 +325,30 @@ public class WorldGuardPlayerListener implements Listener {
         }
     }
 
+    @EventHandler(ignoreCancelled = true)
+    public void onPlayerLogin(PlayerLoginEvent event) {
+        Player player = event.getPlayer();
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+        
+        String hostKey = cfg.hostKeys.get(player.getName().toLowerCase());
+        if (hostKey != null) {
+            String hostname = event.getHostname();
+            int colonIndex = hostname.indexOf(':');
+            if (colonIndex != -1) {
+                hostname = hostname.substring(0, colonIndex);
+            }
+            
+            if (!hostname.equals(hostKey)) {
+                event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
+                        "You did not join with the valid host key!");
+                plugin.getLogger().warning("WorldGuard host key check: " +
+                        player.getName() + " joined with '" + hostname +
+                        "' but '" + hostKey + "' was expected. Kicked!");
+                return;
+            }
+        }
+    }
+
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
@@ -848,6 +911,14 @@ public class WorldGuardPlayerListener implements Listener {
     public void onPlayerDropItem(PlayerDropItemEvent event) {
         ConfigurationManager cfg = plugin.getGlobalStateManager();
         WorldConfiguration wcfg = cfg.get(event.getPlayer().getWorld());
+        Player player = event.getPlayer();
+
+        if (wcfg.useRegions) {
+            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.ITEM_DROP, player.getLocation())) {
+                event.setCancelled(true);
+                player.sendMessage(ChatColor.RED + "You don't have permission to do that in this area.");
+            }
+        }
 
         if (wcfg.getBlacklist() != null) {
             Item ci = event.getItemDrop();
@@ -1003,27 +1074,23 @@ public class WorldGuardPlayerListener implements Listener {
             Vector pt = toVector(player.getLocation());
             RegionManager mgr = plugin.getGlobalRegionManager().get(world);
             ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-            ProtectedRegion globalRegion = mgr.getRegion("__global__");
 
             String[] parts = event.getMessage().split(" ");
+            String lowerCommand = parts[0].toLowerCase();
 
             Set<String> allowedCommands = set.getFlag(DefaultFlag.ALLOWED_CMDS, localPlayer);
-            if (allowedCommands == null && globalRegion != null) {
-                allowedCommands = globalRegion.getFlag(DefaultFlag.ALLOWED_CMDS);
-            }
-            if (allowedCommands != null && !allowedCommands.contains(parts[0].toLowerCase())) {
+            Set<String> blockedCommands = set.getFlag(DefaultFlag.BLOCKED_CMDS, localPlayer);
 
-                player.sendMessage(ChatColor.RED + parts[0].toLowerCase() + " is not allowed in this area.");
+            if (allowedCommands != null && !allowedCommands.contains(lowerCommand)
+                    && (blockedCommands == null || blockedCommands.contains(lowerCommand))) {
+                player.sendMessage(ChatColor.RED + lowerCommand + " is not allowed in this area.");
                 event.setCancelled(true);
                 return;
             }
 
-            Set<String> blockedCommands = set.getFlag(DefaultFlag.BLOCKED_CMDS, localPlayer);
-            if (blockedCommands == null && globalRegion != null) {
-                blockedCommands = globalRegion.getFlag(DefaultFlag.BLOCKED_CMDS);
-            }
-            if (blockedCommands != null && blockedCommands.contains(parts[0].toLowerCase())) {
-                player.sendMessage(ChatColor.RED + parts[0].toLowerCase() + " is blocked in this area.");
+            if (blockedCommands != null && blockedCommands.contains(lowerCommand)
+                    && (allowedCommands == null || !allowedCommands.contains(lowerCommand))) {
+                player.sendMessage(ChatColor.RED + lowerCommand + " is blocked in this area.");
                 event.setCancelled(true);
                 return;
             }

src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java

@@ -19,6 +19,7 @@
 
 package com.sk89q.worldguard.protection.flags;
 
+import org.bukkit.GameMode;
 import org.bukkit.entity.EntityType;
 
 /**
@@ -63,6 +64,7 @@ public final class DefaultFlag {
     public static final StateFlag RECEIVE_CHAT = new StateFlag("receive-chat", true);
     public static final StateFlag ENTRY = new StateFlag("entry", true);
     public static final StateFlag EXIT = new StateFlag("exit", true);
+    public static final StateFlag ITEM_DROP = new StateFlag("item-drop", true);
     public static final StateFlag ENTITY_PAINTING_DESTROY = new StateFlag("entity-painting-destroy", true);
     public static final StateFlag POTION_SPLASH = new StateFlag("potion-splash", true);
     public static final StringFlag GREET_MESSAGE = new StringFlag("greeting", RegionGroup.ALL);
@@ -70,6 +72,7 @@ public final class DefaultFlag {
     public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter", RegionGroup.ALL);
     public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave", RegionGroup.ALL);
     public static final SetFlag<EntityType> DENY_SPAWN = new SetFlag<EntityType>("deny-spawn", RegionGroup.ALL, new EntityTypeFlag(null));
+    public static final EnumFlag<GameMode> GAME_MODE = new EnumFlag<GameMode>("game-mode", GameMode.class, RegionGroup.ALL);
     public static final IntegerFlag HEAL_DELAY = new IntegerFlag("heal-delay", RegionGroup.ALL);
     public static final IntegerFlag HEAL_AMOUNT = new IntegerFlag("heal-amount", RegionGroup.ALL);
     public static final IntegerFlag MIN_HEAL = new IntegerFlag("heal-min-health", RegionGroup.ALL);
@@ -91,10 +94,10 @@ public final class DefaultFlag {
         MOB_DAMAGE, MOB_SPAWNING, DENY_SPAWN, INVINCIBILITY, EXP_DROPS,
         CREEPER_EXPLOSION, ENDERDRAGON_BLOCK_DAMAGE, GHAST_FIREBALL, ENDER_BUILD,
         GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_ENTER, NOTIFY_LEAVE,
-        EXIT, ENTRY, LIGHTNING, ENTITY_PAINTING_DESTROY,
+        EXIT, ENTRY, LIGHTNING, ENTITY_PAINTING_DESTROY, ITEM_DROP,
         HEAL_AMOUNT, HEAL_DELAY, MIN_HEAL, MAX_HEAL,
         FEED_DELAY, FEED_AMOUNT, MIN_FOOD, MAX_FOOD,
-        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT,
+        SNOW_FALL, SNOW_MELT, ICE_FORM, ICE_MELT, GAME_MODE,
         MUSHROOMS, LEAF_DECAY, GRASS_SPREAD, SEND_CHAT, RECEIVE_CHAT,
         FIRE_SPREAD, LAVA_FIRE, LAVA_FLOW, WATER_FLOW,
         TELE_LOC, SPAWN_LOC, POTION_SPLASH,

src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java

@@ -41,6 +41,10 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
     }
 
     private T findValue(String input) throws IllegalArgumentException {
+        if (input != null) {
+            input = input.toUpperCase();
+        }
+
         try {
             return Enum.valueOf(enumClass, input);
         } catch (IllegalArgumentException e) {
@@ -88,5 +92,5 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
     public Object marshal(T o) {
         return o.name();
     }
-    
+
 }

src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java

@@ -38,7 +38,7 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
  * @author sk89q
  */
 public class LocationFlag extends Flag<Location> {
-    
+
     public LocationFlag(String name, RegionGroup defaultGroup) {
         super(name, defaultGroup);
     }
@@ -139,16 +139,11 @@ public class LocationFlag extends Flag<Location> {
     }
 
     private double toNumber(Object o) {
-        if (o instanceof Integer) {
-            return (Integer) o;
-        } else if (o instanceof Long) {
-            return (Long) o;
-        } else if (o instanceof Float) {
-            return (Float) o;
-        } else if (o instanceof Double) {
-            return (Double) o;
+        if (o instanceof Number) {
+            return ((Number) o).doubleValue();
         } else {
             return 0;
         }
+
     }
 }

src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java

@@ -39,7 +39,7 @@ public class StringFlag extends Flag<String> {
     @Override
     public String parseInput(WorldGuardPlugin plugin, CommandSender sender,
             String input) throws InvalidFlagFormat {
-        return input;
+        return input.replaceAll("(?!\\\\)\\\\n", "\n").replaceAll("\\\\\\\\n", "\\n");
     }
 
     @Override

src/test/java/com/sk89q/worldguard/TestPlayer.java

@@ -24,6 +24,7 @@ import java.util.HashSet;
 import com.sk89q.worldedit.Vector;
 import com.sk89q.worldguard.LocalPlayer;
 
+@org.junit.Ignore
 public class TestPlayer extends LocalPlayer {
     private String name;
     private Set<String> groups = new HashSet<String>();