Updated CHANGELOG.txt.

CHANGELOG.txt

@@ -1,3 +1,7 @@
+3.2.3:
+- Updated for recent Bukkit builds. Thank Zenexer for changes.
+- Added suppress-tick-sync-warnings.
+
 3.2.2:
 - Changed disable-water-damage to disable-drowning-damage.
 - Fixed suffocation disable option.

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

@@ -426,9 +426,9 @@ public class WorldGuardBlockListener extends BlockListener {
      * @param event Relevant event details
      */
     @Override
-    public void onBlockRedstoneChange(BlockFromToEvent event) {
+    public void onBlockRedstoneChange(BlockRedstoneEvent event) {
         World world = event.getBlock().getWorld();
-        Block blockTo = event.getToBlock();
+        Block blockTo = event.getBlock();
 
         if (plugin.simulateSponge && plugin.redstoneSponges) {
             int ox = blockTo.getX();

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

@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 package com.sk89q.worldguard.bukkit;
 
 import org.bukkit.ChatColor;
@@ -34,252 +33,241 @@ import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldguard.protection.AreaFlags;
 import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
 
-public class WorldGuardEntityListener extends EntityListener {
-    /**
-     * Plugin.
-     */
-    private WorldGuardPlugin plugin;
-    
-    /**
-     * Construct the object;
-     * 
-     * @param plugin
-     */
-    public WorldGuardEntityListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
 
-    @Override
-    public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
-        Entity defender = event.getEntity();
-        DamageCause type = event.getCause();
-        
-        if (defender instanceof Player) {            
-            Player player = (Player)defender;
+public class WorldGuardEntityListener extends EntityListener
+{
+	/**
+	 * Plugin.
+	 */
+	private WorldGuardPlugin plugin;
 
-            if (plugin.invinciblePlayers.contains(player.getName())) {
-                event.setCancelled(true);
-                return;
-            }
+	/**
+	 * Construct the object;
+	 *
+	 * @param plugin
+	 */
+	public WorldGuardEntityListener(WorldGuardPlugin plugin)
+	{
+		this.plugin = plugin;
+	}
 
-            if (plugin.disableLavaDamage && type == DamageCause.LAVA) {
-                event.setCancelled(true);
-                return;
-            }
+	@Override
+	public void onEntityDamage(EntityDamageEvent event)
+	{
+		Entity defender = event.getEntity();
+		DamageCause type = event.getCause();
 
-            if (plugin.disableContactDamage && type == DamageCause.CONTACT) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
+		if (defender instanceof Player)
+		{
+			Player player = (Player)defender;
 
-    @Override
-    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
-        Entity attacker = event.getDamager();
-        Entity defender = event.getEntity();
-        
-        if (defender instanceof Player) {
-            Player player = (Player)defender;
+			if (plugin.invinciblePlayers.contains(player.getName()))
+			{
+				event.setCancelled(true);
+				return;
+			}
 
-            if (plugin.invinciblePlayers.contains(player.getName())) {
-                event.setCancelled(true);
-                return;
-            }
+			if (plugin.disableLavaDamage && type == DamageCause.LAVA)
+			{
+				event.setCancelled(true);
+				return;
+			}
 
-            if (attacker != null && attacker instanceof Player) {
-                if (plugin.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    
-                    if (!plugin.regionManager.getApplicableRegions(pt)
-                            .allowsFlag(AreaFlags.FLAG_PVP)) {
-                        ((Player)attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-            
-            if (attacker != null && attacker instanceof Monster) {
-                if (attacker instanceof Creeper && plugin.blockCreeperExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
-                
-                if (plugin.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    
-                    if (!plugin.regionManager.getApplicableRegions(pt)
-                            .allowsFlag(AreaFlags.FLAG_MOB_DAMAGE)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                    
-                    if (attacker instanceof Creeper) {
-                        if (!plugin.regionManager.getApplicableRegions(pt)
-                                .allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) {
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-                
-            }
-        }
-    }
-    
-    public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
-        Entity defender = event.getEntity();
-        Entity attacker = event.getDamager();
-        
-        if (defender instanceof Player) {            
-            Player player = (Player)defender;
+			if (plugin.disableContactDamage && type == DamageCause.CONTACT)
+			{
+				event.setCancelled(true);
+				return;
+			}
 
-            if (plugin.invinciblePlayers.contains(player.getName())) {
-                event.setCancelled(true);
-                return;
-            }
+			if (type == DamageCause.ENTITY_ATTACK)
+			{
+				Entity attacker = ((EntityDamageByEntityEvent)event).getDamager();
 
-            if (attacker != null && attacker instanceof Player) {
-                if (plugin.useRegions) {
-                    Vector pt = toVector(defender.getLocation());
-                    
-                    if (!plugin.regionManager.getApplicableRegions(pt)
-                            .allowsFlag(AreaFlags.FLAG_PVP)) {
-                        ((Player)attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-        }
+				if (plugin.invinciblePlayers.contains(player.getName()))
+				{
+					event.setCancelled(true);
+					return;
+				}
 
-    }
+				if (attacker != null && attacker instanceof Player)
+				{
+					if (plugin.useRegions)
+					{
+						Vector pt = toVector(defender.getLocation());
 
-    public void onEntityDamage(EntityDamageEvent event) {
-        Entity defender = event.getEntity();
-        DamageCause type = event.getCause();
-        
-        if (defender instanceof Player) {            
-            Player player = (Player)defender;
+						if (!plugin.regionManager.getApplicableRegions(pt).allowsFlag(AreaFlags.FLAG_PVP))
+						{
+							((Player)attacker).sendMessage(ChatColor.DARK_RED + "You are in a no-PvP area.");
+							event.setCancelled(true);
+							return;
+						}
+					}
+				}
 
-            if (plugin.invinciblePlayers.contains(player.getName())) {
-                event.setCancelled(true);
-                return;
-            }
-            
-            if (plugin.disableFallDamage && type == DamageCause.FALL) {
-                event.setCancelled(true);
-                return;
-            }
+				if (attacker != null && attacker instanceof Monster)
+				{
+					if (attacker instanceof Creeper && plugin.blockCreeperExplosions)
+					{
+						event.setCancelled(true);
+						return;
+					}
 
-            if (plugin.disableFireDamage && (type == DamageCause.FIRE
-                    || type == DamageCause.FIRE_TICK)) {
-                event.setCancelled(true);
-                return;
-            }
+					if (plugin.useRegions)
+					{
+						Vector pt = toVector(defender.getLocation());
 
-            if (plugin.disableDrowningDamage && type == DamageCause.DROWNING) {
-                event.setCancelled(true);
-                return;
-            }
-            
-            if (plugin.teleportOnSuffocation && type == DamageCause.SUFFOCATION) {
-                findFreePosition(player);
-                event.setCancelled(true);
-                return;
-            }
+						if (!plugin.regionManager.getApplicableRegions(pt).allowsFlag(AreaFlags.FLAG_MOB_DAMAGE))
+						{
+							event.setCancelled(true);
+							return;
+						}
 
-            if (plugin.disableSuffocationDamage && type == DamageCause.SUFFOCATION) {
-                event.setCancelled(true);
-                return;
-            }
+						if (attacker instanceof Creeper)
+						{
+							if (!plugin.regionManager.getApplicableRegions(pt).allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION))
+							{
+								event.setCancelled(true);
+								return;
+							}
+						}
+					}
+				}
+			}
 
-            if (type == DamageCause.DROWNING
-                    && plugin.amphibiousPlayers.contains(player.getName())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
+			if (plugin.disableFallDamage && type == DamageCause.FALL)
+			{
+				event.setCancelled(true);
+				return;
+			}
 
-    @Override
-    public void onEntityExplode(EntityExplodeEvent event) {
-        if (event.getEntity() instanceof LivingEntity) {
-            if (plugin.blockCreeperBlockDamage) {
-                event.setCancelled(true);
-                return;
-            }
-            
-            if (plugin.blockCreeperExplosions) {
-                event.setCancelled(true);
-                return;
-            }
-            
-            if (plugin.useRegions) {
-                Vector pt = toVector(event.getEntity().getLocation());
-                
-                if (!plugin.regionManager.getApplicableRegions(pt)
-                        .allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        } else { // Shall assume that this is TNT
-            if (plugin.blockTNT) {
-                event.setCancelled(true);
-                return;
-            }
-            
-            if (plugin.useRegions && event.getEntity() != null) {
-                Vector pt = toVector(event.getEntity().getLocation());
-                
-                if (!plugin.regionManager.getApplicableRegions(pt)
-                        .allowsFlag(AreaFlags.FLAG_TNT)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-    }
-    
-    /**
-     * Find a position for the player to stand that is not inside a block.
-     * Blocks above the player will be iteratively tested until there is
-     * a series of two free blocks. The player will be teleported to
-     * that free position.
-     *
-     * @param player
-     */
-    public void findFreePosition(Player player) {
-        Location loc = player.getLocation();
-        int x = loc.getBlockX();
-        int y = Math.max(0, loc.getBlockY());
-        int origY = y;
-        int z = loc.getBlockZ();
-        World world = player.getWorld();
+			if (plugin.disableFireDamage && (type == DamageCause.FIRE
+											 || type == DamageCause.FIRE_TICK))
+			{
+				event.setCancelled(true);
+				return;
+			}
 
-        byte free = 0;
+			if (plugin.disableDrowningDamage && type == DamageCause.DROWNING)
+			{
+				event.setCancelled(true);
+				return;
+			}
 
-        while (y <= 129) {
-            if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) {
-                free++;
-            } else {
-                free = 0;
-            }
+			if (plugin.teleportOnSuffocation && type == DamageCause.SUFFOCATION)
+			{
+				findFreePosition(player);
+				event.setCancelled(true);
+				return;
+			}
 
-            if (free == 2) {
-                if (y - 1 != origY) {
-                    loc.setX(x + 0.5);
-                    loc.setY(y);
-                    loc.setZ(z + 0.5);
-                    player.teleportTo(loc);
-                }
+			if (plugin.disableSuffocationDamage && type == DamageCause.SUFFOCATION)
+			{
+				event.setCancelled(true);
+				return;
+			}
 
-                return;
-            }
+			if (type == DamageCause.DROWNING
+				&& plugin.amphibiousPlayers.contains(player.getName()))
+			{
+				event.setCancelled(true);
+				return;
+			}
+		}
+	}
 
-            y++;
-        }
-    }
+	@Override
+	public void onEntityExplode(EntityExplodeEvent event)
+	{
+		if (event.getEntity() instanceof LivingEntity)
+		{
+			if (plugin.blockCreeperBlockDamage)
+			{
+				event.setCancelled(true);
+				return;
+			}
+
+			if (plugin.blockCreeperExplosions)
+			{
+				event.setCancelled(true);
+				return;
+			}
+
+			if (plugin.useRegions)
+			{
+				Vector pt = toVector(event.getEntity().getLocation());
+
+				if (!plugin.regionManager.getApplicableRegions(pt).allowsFlag(AreaFlags.FLAG_CREEPER_EXPLOSION))
+				{
+					event.setCancelled(true);
+					return;
+				}
+			}
+		}
+		else
+		{ // Shall assume that this is TNT
+			if (plugin.blockTNT)
+			{
+				event.setCancelled(true);
+				return;
+			}
+
+			if (plugin.useRegions && event.getEntity() != null)
+			{
+				Vector pt = toVector(event.getEntity().getLocation());
+
+				if (!plugin.regionManager.getApplicableRegions(pt).allowsFlag(AreaFlags.FLAG_TNT))
+				{
+					event.setCancelled(true);
+					return;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find a position for the player to stand that is not inside a block.
+	 * Blocks above the player will be iteratively tested until there is
+	 * a series of two free blocks. The player will be teleported to
+	 * that free position.
+	 *
+	 * @param player
+	 */
+	public void findFreePosition(Player player)
+	{
+		Location loc = player.getLocation();
+		int x = loc.getBlockX();
+		int y = Math.max(0, loc.getBlockY());
+		int origY = y;
+		int z = loc.getBlockZ();
+		World world = player.getWorld();
+
+		byte free = 0;
+
+		while (y <= 129)
+		{
+			if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z)))
+			{
+				free++;
+			}
+			else
+			{
+				free = 0;
+			}
+
+			if (free == 2)
+			{
+				if (y - 1 != origY)
+				{
+					loc.setX(x + 0.5);
+					loc.setY(y);
+					loc.setZ(z + 0.5);
+					player.teleportTo(loc);
+				}
+
+				return;
+			}
+
+			y++;
+		}
+	}
 }

src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java

@@ -20,7 +20,6 @@
 package com.sk89q.worldguard.bukkit;
 
 import static com.sk89q.worldguard.bukkit.BukkitUtil.matchSinglePlayer;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 import java.io.*;
 import java.util.*;
 import java.util.logging.*;
@@ -31,14 +30,11 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.Server;
 import org.bukkit.event.Event.Priority;
 import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginLoader;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.config.Configuration;
 import com.sk89q.bukkit.migration.PermissionsResolverManager;
@@ -65,21 +61,21 @@ import com.sk89q.worldguard.protection.ProtectedRegion.CircularInheritanceExcept
  * 
  * @author sk89qs
  */
-public class WorldGuardPlugin extends JavaPlugin {
+public final class WorldGuardPlugin extends JavaPlugin {
     private static final Logger logger = Logger.getLogger("Minecraft.WorldGuard");
     
     private static Pattern groupPattern = Pattern.compile("^[gG]:(.+)$");
     private static int CMD_LIST_SIZE = 9;
     
-    private final WorldGuardPlayerListener playerListener =
+    private WorldGuardPlayerListener playerListener =
         new WorldGuardPlayerListener(this);
-    private final WorldGuardBlockListener blockListener =
+    private WorldGuardBlockListener blockListener =
         new WorldGuardBlockListener(this);
-    private final WorldGuardEntityListener entityListener =
+    private WorldGuardEntityListener entityListener =
         new WorldGuardEntityListener(this);
-    private final PermissionsResolverServerListener permsListener;
+    private PermissionsResolverServerListener permsListener;
     
-    private final PermissionsResolverManager perms;
+    private PermissionsResolverManager perms;
     
     Blacklist blacklist;
 
@@ -135,29 +131,19 @@ public class WorldGuardPlugin extends JavaPlugin {
 
     boolean useRegions;
     int regionWand = 287; 
-    
-    /**
-     * Construct the plugin.
-     * 
-     * @param pluginLoader
-     * @param instance
-     * @param desc
-     * @param folder
-     * @param plugin
-     * @param cLoader
-     */
-    public WorldGuardPlugin(PluginLoader pluginLoader, Server instance,
-            PluginDescriptionFile desc, File folder, File plugin, ClassLoader cLoader) {
-        super(pluginLoader, instance, desc, folder, plugin, cLoader);
 
-        logger.info("WorldGuard " + desc.getVersion() + " loaded.");
+    /**
+     * Called on plugin enable.
+     */
+    public void onEnable() {
+        logger.info("WorldGuard " + getDescription().getVersion() + " loaded.");
         
-        folder.mkdirs();
+        getDataFolder().mkdirs();
 
         createDefaultConfiguration("config.yml");
         createDefaultConfiguration("blacklist.txt");
         
-        regionLoader = new CSVDatabase(new File(folder, "regions.txt"));
+        regionLoader = new CSVDatabase(new File(getDataFolder(), "regions.txt"));
         perms = new PermissionsResolverManager(getConfiguration(), getServer(),
                 "WorldGuard", logger);
         permsListener = new PermissionsResolverServerListener(perms);
@@ -175,12 +161,6 @@ public class WorldGuardPlugin extends JavaPlugin {
         }
     }
 
-    /**
-     * Called on plugin enable.
-     */
-    public void onEnable() {
-    }
-
     /**
      * Called on plugin disable.
      */
@@ -202,9 +182,6 @@ public class WorldGuardPlugin extends JavaPlugin {
         registerEvent(Event.Type.REDSTONE_CHANGE, blockListener, Priority.High);
 
         registerEvent(Event.Type.ENTITY_DAMAGED, entityListener, Priority.High);
-        registerEvent(Event.Type.ENTITY_DAMAGEDBY_PROJECTILE, entityListener, Priority.High);
-        registerEvent(Event.Type.ENTITY_DAMAGEDBY_BLOCK, entityListener, Priority.High);
-        registerEvent(Event.Type.ENTITY_DAMAGEDBY_ENTITY, entityListener, Priority.High);
         registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.High);
 
         registerEvent(Event.Type.PLAYER_ITEM, playerListener, Priority.High);