Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-01-23 07:41:21 +01:00
Code Issues Projects Releases Wiki Activity

My local craftbukkit got out of sync with the build server's. Re-adding event names until they get deprecated on the bukkit SNAPSHOT build.

Browse Source
This commit is contained in:
taoneill 2012-01-22 22:28:59 -05:00
parent ee7dab194a
commit f06afb5aa3
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
war/src/main/java/com/tommytony/war/event/WarBlockListener.java
View File

@ -40,7 +40,7 @@ public class WarBlockListener implements Listener {
/**
* @see BlockListener.onBlockPlace()
*/
@EventHandler
@EventHandler(event = BlockPlaceEvent.class)
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
@EventHandler(event = BlockPistonExtendEvent.class)
// 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
@EventHandler(event = BlockPistonRetractEvent.class)
public void onBlockPistonRetract(final BlockPistonRetractEvent event) {
Warzone zone = Warzone.getZoneByLocation(event.getBlock().getLocation());
if (zone!=null) {
@ -209,7 +209,7 @@ public class WarBlockListener implements Listener {
}
}
@EventHandler
@EventHandler(event = BlockDamageEvent.class)
public void onBlockDamage(final BlockDamageEvent event) {
if (!War.war.isLoaded()) {
return;

18
war/src/main/java/com/tommytony/war/event/WarEntityListener.java
View File

@ -252,7 +252,7 @@ public class WarEntityListener implements Listener {
*
* @see EntityListener.onEntityExplode()
*/
@EventHandler
@EventHandler(event = EntityExplodeEvent.class)
public void onEntityExplode(final EntityExplodeEvent event) {
if (!War.war.isLoaded()) {
return;
@ -367,7 +367,7 @@ public class WarEntityListener implements Listener {
*
* @see EntityListener.onEntityDamage()
*/
@EventHandler
@EventHandler(event = EntityDamageEvent.class)
public void onEntityDamage(final EntityDamageEvent event) {
if (!War.war.isLoaded()) {
return;
@ -412,8 +412,8 @@ public class WarEntityListener implements Listener {
}
}
@EventHandler
public void onEntityCombust(final EntityCombustEvent event) {
@EventHandler(event = EntityDamageEvent.class)
public void onEntityCombust(final EntityDamageEvent event) {
if (!War.war.isLoaded()) {
return;
}
@ -438,7 +438,7 @@ public class WarEntityListener implements Listener {
*
* @see EntityListener.onCreatureSpawn()
*/
@EventHandler
@EventHandler(event = CreatureSpawnEvent.class)
public void onCreatureSpawn(final CreatureSpawnEvent event) {
if (!War.war.isLoaded()) {
return;
@ -456,7 +456,7 @@ public class WarEntityListener implements Listener {
*
* @see EntityListener.onEntityRegainHealth()
*/
@EventHandler
@EventHandler(event = EntityRegainHealthEvent.class)
public void onEntityRegainHealth(final EntityRegainHealthEvent event) {
if (!War.war.isLoaded() ||
(event.getRegainReason() != RegainReason.REGEN
@ -486,7 +486,7 @@ public class WarEntityListener implements Listener {
}
}
@EventHandler
@EventHandler(event = FoodLevelChangeEvent.class)
public void onFoodLevelChange(final FoodLevelChangeEvent event) {
if (!War.war.isLoaded() || !(event.getEntity() instanceof Player)) {
return;
@ -500,7 +500,7 @@ public class WarEntityListener implements Listener {
}
}
@EventHandler
@EventHandler(event = EntityDeathEvent.class)
public void onEntityDeath(final EntityDeathEvent event) {
if (!War.war.isLoaded() || !(event.getEntity() instanceof Player)) {
return;
@ -518,7 +518,7 @@ public class WarEntityListener implements Listener {
}
}
@EventHandler
@EventHandler(event = ExplosionPrimeEvent.class)
public void onExplosionPrime(final ExplosionPrimeEvent event) {
if (!War.war.isLoaded()) {
return;

14
war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
View File

@ -56,7 +56,7 @@ public class WarPlayerListener implements Listener {
*
* @see PlayerListener.onPlayerQuit()
*/
@EventHandler
@EventHandler(event = PlayerQuitEvent.class)
public void onPlayerQuit(final PlayerQuitEvent event) {
if (War.war.isLoaded()) {
Player player = event.getPlayer();
@ -71,7 +71,7 @@ public class WarPlayerListener implements Listener {
}
}
@EventHandler
@EventHandler(event = PlayerDropItemEvent.class)
public void onPlayerDropItem(final PlayerDropItemEvent event) {
if (War.war.isLoaded()) {
Player player = event.getPlayer();
@ -133,7 +133,7 @@ public class WarPlayerListener implements Listener {
}
}
@EventHandler
@EventHandler(event = PlayerPickupItemEvent.class)
public void onPlayerPickupItem(final PlayerPickupItemEvent event) {
if (War.war.isLoaded()) {
Player player = event.getPlayer();
@ -208,7 +208,7 @@ public class WarPlayerListener implements Listener {
}
}
@EventHandler
@EventHandler(event = PlayerKickEvent.class)
public void onPlayerKick(final PlayerKickEvent event) {
if (War.war.isLoaded()) {
Player player = event.getPlayer();
@ -228,7 +228,7 @@ public class WarPlayerListener implements Listener {
}
}
@EventHandler
@EventHandler(event = PlayerInteractEvent.class)
public void onPlayerInteract(PlayerInteractEvent event) {
if (War.war.isLoaded()) {
Player player = event.getPlayer();
@ -265,7 +265,7 @@ public class WarPlayerListener implements Listener {
}
}
@EventHandler
@EventHandler(event = PlayerMoveEvent.class)
public void onPlayerMove(final PlayerMoveEvent event) {
if (!War.war.isLoaded()) {
return;
@ -723,7 +723,7 @@ public class WarPlayerListener implements Listener {
}
}
@EventHandler
@EventHandler(event = PlayerToggleSneakEvent.class)
public void onPlayerToggleSneak(PlayerToggleSneakEvent event) {
if (War.war.isLoaded() && event.isSneaking()) {
Warzone playerWarzone = Warzone.getZoneByLocation(event.getPlayer());

2
war/src/main/java/com/tommytony/war/event/WarServerListener.java
View File

@ -11,7 +11,7 @@ import com.tommytony.war.War;
public class WarServerListener implements Listener {
@EventHandler
@EventHandler(event = PluginDisableEvent.class)
public void onPluginDisable(final PluginDisableEvent event) {
if (event.getPlugin().getDataFolder().getName().equals("Spout")) {
if (War.war.isSpoutServer()) {