From 668285ac97c7496f2a5498e9d78cf4ca0f74c9fe Mon Sep 17 00:00:00 2001 From: taoneill Date: Thu, 26 Jan 2012 20:40:12 -0500 Subject: [PATCH] Updated pom to Bukkit 1.1-R1, which broke the Events API again. Guess they never heard of backward compatibility. Oh well. --- war/pom.xml | 4 ++-- .../tommytony/war/event/WarBlockListener.java | 10 +++++----- .../war/event/WarEntityListener.java | 16 +++++++-------- .../war/event/WarPlayerListener.java | 20 +++++++++---------- .../war/event/WarServerListener.java | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/war/pom.xml b/war/pom.xml index 2352233..0c115de 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -56,13 +56,13 @@ org.bukkit bukkit - 1.1-R1-SNAPSHOT + 1.1-R1 compile org.bukkit craftbukkit - 1.1-R1-SNAPSHOT + 1.1-R1 compile diff --git a/war/src/main/java/com/tommytony/war/event/WarBlockListener.java b/war/src/main/java/com/tommytony/war/event/WarBlockListener.java index 8966800..be6b4cb 100644 --- a/war/src/main/java/com/tommytony/war/event/WarBlockListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarBlockListener.java @@ -40,7 +40,7 @@ public class WarBlockListener implements Listener { /** * @see BlockListener.onBlockPlace() */ - @EventHandler(event = BlockPlaceEvent.class) + @EventHandler public void onBlockPlace(final BlockPlaceEvent event) { if (!War.war.isLoaded()) { return; @@ -164,7 +164,7 @@ public class WarBlockListener implements Listener { event.getPlayer().setItemInHand(newItemInHand); } - @EventHandler(event = BlockPistonExtendEvent.class) + @EventHandler // Do not allow moving of block into or from important zones public void onBlockPistonExtend(final BlockPistonExtendEvent event) { Warzone zone = Warzone.getZoneByLocation(event.getBlock().getLocation()); @@ -182,7 +182,7 @@ public class WarBlockListener implements Listener { } } - @EventHandler(event = BlockPistonRetractEvent.class) + @EventHandler public void onBlockPistonRetract(final BlockPistonRetractEvent event) { Warzone zone = Warzone.getZoneByLocation(event.getBlock().getLocation()); if (zone!=null) { @@ -197,7 +197,7 @@ public class WarBlockListener implements Listener { /** * @see BlockListener.onBlockBreak() */ - @EventHandler(event = BlockBreakEvent.class) + @EventHandler public void onBlockBreak(final BlockBreakEvent event) { if (!War.war.isLoaded()) { return; @@ -209,7 +209,7 @@ public class WarBlockListener implements Listener { } } - @EventHandler(event = BlockDamageEvent.class) + @EventHandler public void onBlockDamage(final BlockDamageEvent event) { if (!War.war.isLoaded()) { return; diff --git a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java index 88ef9c9..0922cc1 100644 --- a/war/src/main/java/com/tommytony/war/event/WarEntityListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarEntityListener.java @@ -291,7 +291,7 @@ public class WarEntityListener implements Listener { * * @see EntityListener.onEntityExplode() */ - @EventHandler(event = EntityExplodeEvent.class) + @EventHandler public void onEntityExplode(final EntityExplodeEvent event) { if (!War.war.isLoaded()) { return; @@ -406,7 +406,7 @@ public class WarEntityListener implements Listener { * * @see EntityListener.onEntityDamage() */ - @EventHandler(event = EntityDamageEvent.class) + @EventHandler public void onEntityDamage(final EntityDamageEvent event) { if (!War.war.isLoaded()) { return; @@ -467,7 +467,7 @@ public class WarEntityListener implements Listener { } } - @EventHandler(event = EntityDamageEvent.class) + @EventHandler public void onEntityCombust(final EntityDamageEvent event) { if (!War.war.isLoaded()) { return; @@ -493,7 +493,7 @@ public class WarEntityListener implements Listener { * * @see EntityListener.onCreatureSpawn() */ - @EventHandler(event = CreatureSpawnEvent.class) + @EventHandler public void onCreatureSpawn(final CreatureSpawnEvent event) { if (!War.war.isLoaded()) { return; @@ -511,7 +511,7 @@ public class WarEntityListener implements Listener { * * @see EntityListener.onEntityRegainHealth() */ - @EventHandler(event = EntityRegainHealthEvent.class) + @EventHandler public void onEntityRegainHealth(final EntityRegainHealthEvent event) { if (!War.war.isLoaded() || (event.getRegainReason() != RegainReason.REGEN @@ -541,7 +541,7 @@ public class WarEntityListener implements Listener { } } - @EventHandler(event = FoodLevelChangeEvent.class) + @EventHandler public void onFoodLevelChange(final FoodLevelChangeEvent event) { if (!War.war.isLoaded() || !(event.getEntity() instanceof Player)) { return; @@ -555,7 +555,7 @@ public class WarEntityListener implements Listener { } } - @EventHandler(event = EntityDeathEvent.class) + @EventHandler public void onEntityDeath(final EntityDeathEvent event) { if (!War.war.isLoaded() || !(event.getEntity() instanceof Player)) { return; @@ -578,7 +578,7 @@ public class WarEntityListener implements Listener { } } - @EventHandler(event = ExplosionPrimeEvent.class) + @EventHandler public void onExplosionPrime(final ExplosionPrimeEvent event) { if (!War.war.isLoaded()) { return; diff --git a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java index 537485a..d2f5de5 100644 --- a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java @@ -59,7 +59,7 @@ public class WarPlayerListener implements Listener { * * @see PlayerListener.onPlayerQuit() */ - @EventHandler(event = PlayerQuitEvent.class) + @EventHandler public void onPlayerQuit(final PlayerQuitEvent event) { if (War.war.isLoaded()) { Player player = event.getPlayer(); @@ -74,7 +74,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerDropItemEvent.class) + @EventHandler public void onPlayerDropItem(final PlayerDropItemEvent event) { if (War.war.isLoaded()) { Player player = event.getPlayer(); @@ -136,7 +136,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerPickupItemEvent.class) + @EventHandler public void onPlayerPickupItem(final PlayerPickupItemEvent event) { if (War.war.isLoaded()) { Player player = event.getPlayer(); @@ -165,7 +165,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerInventoryEvent.class) + @EventHandler public void onInventoryOpen(final PlayerInventoryEvent event) { if (War.war.isLoaded()) { Player player = event.getPlayer(); @@ -185,7 +185,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerCommandPreprocessEvent.class) + @EventHandler public void onPlayerCommandPreprocess(final PlayerCommandPreprocessEvent event) { if (War.war.isLoaded()) { Player player = event.getPlayer(); @@ -211,7 +211,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerKickEvent.class) + @EventHandler public void onPlayerKick(final PlayerKickEvent event) { if (War.war.isLoaded()) { Player player = event.getPlayer(); @@ -231,7 +231,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerInteractEvent.class) + @EventHandler public void onPlayerInteract(PlayerInteractEvent event) { if (War.war.isLoaded()) { Player player = event.getPlayer(); @@ -268,7 +268,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerMoveEvent.class) + @EventHandler public void onPlayerMove(final PlayerMoveEvent event) { if (!War.war.isLoaded()) { return; @@ -739,7 +739,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerToggleSneakEvent.class) + @EventHandler public void onPlayerToggleSneak(PlayerToggleSneakEvent event) { if (War.war.isLoaded() && event.isSneaking()) { Warzone playerWarzone = Warzone.getZoneByLocation(event.getPlayer()); @@ -759,7 +759,7 @@ public class WarPlayerListener implements Listener { } } - @EventHandler(event = PlayerRespawnEvent.class) + @EventHandler public void onPlayerRespawn(PlayerRespawnEvent event) { if (War.war.isLoaded()) { // Anyone who died in warzones needs to go back there pronto! diff --git a/war/src/main/java/com/tommytony/war/event/WarServerListener.java b/war/src/main/java/com/tommytony/war/event/WarServerListener.java index c50cf0f..df995ab 100644 --- a/war/src/main/java/com/tommytony/war/event/WarServerListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarServerListener.java @@ -11,7 +11,7 @@ import com.tommytony.war.War; public class WarServerListener implements Listener { - @EventHandler(event = PluginDisableEvent.class) + @EventHandler public void onPluginDisable(final PluginDisableEvent event) { if (event.getPlugin().getDataFolder().getName().equals("Spout")) { if (War.war.isSpoutServer()) {