From 2dc95da6e06866b90870f473710bc128e18d0ff8 Mon Sep 17 00:00:00 2001 From: Redecouverte Date: Mon, 28 Feb 2011 19:05:07 +0100 Subject: [PATCH] moved registerEvents() int event listeners --- .../bukkit/WorldGuardBlockListener.java | 19 ++++++++ .../bukkit/WorldGuardEntityListener.java | 13 ++++++ .../bukkit/WorldGuardPlayerListener.java | 18 ++++++++ .../worldguard/bukkit/WorldGuardPlugin.java | 46 ++++--------------- 4 files changed, 58 insertions(+), 38 deletions(-) diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java index f46d0c52..9d6f0bff 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java @@ -18,6 +18,9 @@ */ package com.sk89q.worldguard.bukkit; +import org.bukkit.event.Event.Priority; +import org.bukkit.event.Event; +import org.bukkit.plugin.PluginManager; import com.sk89q.worldguard.protection.regions.flags.RegionFlagContainer; import com.sk89q.worldguard.protection.regions.flags.FlagDatabase.FlagType; import com.nijiko.coelho.iConomy.iConomy; @@ -60,6 +63,22 @@ public WorldGuardBlockListener(WorldGuardPlugin plugin) { this.plugin = plugin; } + public void registerEvents() { + + PluginManager pm = plugin.getServer().getPluginManager(); + + pm.registerEvent(Event.Type.BLOCK_DAMAGED, this, Priority.High, plugin); + pm.registerEvent(Event.Type.BLOCK_BREAK, this, Priority.High, plugin); + pm.registerEvent(Event.Type.BLOCK_FLOW, this, Priority.Normal, plugin); + pm.registerEvent(Event.Type.BLOCK_IGNITE, this, Priority.High, plugin); + pm.registerEvent(Event.Type.BLOCK_PHYSICS, this, Priority.Normal, plugin); + pm.registerEvent(Event.Type.BLOCK_INTERACT, this, Priority.High, plugin); + pm.registerEvent(Event.Type.BLOCK_PLACED, this, Priority.High, plugin); + pm.registerEvent(Event.Type.BLOCK_RIGHTCLICKED, this, Priority.High, plugin); + pm.registerEvent(Event.Type.BLOCK_BURN, this, Priority.High, plugin); + pm.registerEvent(Event.Type.REDSTONE_CHANGE, this, Priority.High, plugin); + } + /** * Called when a block is damaged (or broken) * diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java index 9f8512c7..f6147902 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java @@ -18,6 +18,9 @@ */ package com.sk89q.worldguard.bukkit; +import org.bukkit.event.Event.Priority; +import org.bukkit.event.Event; +import org.bukkit.plugin.PluginManager; import com.sk89q.worldguard.protection.regions.flags.FlagDatabase.FlagType; import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.regionmanager.RegionManager; @@ -53,6 +56,16 @@ public WorldGuardEntityListener(WorldGuardPlugin plugin) { this.plugin = plugin; } + public void registerEvents() { + + PluginManager pm = plugin.getServer().getPluginManager(); + + pm.registerEvent(Event.Type.ENTITY_DAMAGED, this, Priority.High, plugin); + pm.registerEvent(Event.Type.ENTITY_EXPLODE, this, Priority.High, plugin); + pm.registerEvent(Event.Type.CREATURE_SPAWN, this, Priority.High, plugin); + } + + public void onEntityDamageByBlock(EntityDamageByBlockEvent event) { Entity defender = event.getEntity(); diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index c057808a..f8b8bbd0 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -18,6 +18,9 @@ */ package com.sk89q.worldguard.bukkit; +import org.bukkit.event.Event.Priority; +import org.bukkit.event.Event; +import org.bukkit.plugin.PluginManager; import com.sk89q.worldguard.protection.regions.flags.RegionFlag.RegionGroup; import com.sk89q.worldguard.protection.regions.flags.FlagDatabase.FlagType; import com.nijiko.coelho.iConomy.iConomy; @@ -56,6 +59,21 @@ public WorldGuardPlayerListener(WorldGuardPlugin plugin) { this.plugin = plugin; } + + public void registerEvents() { + + PluginManager pm = plugin.getServer().getPluginManager(); + + pm.registerEvent(Event.Type.PLAYER_ITEM, this, Priority.High, plugin); + pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, this, Priority.High, plugin); + pm.registerEvent(Event.Type.PLAYER_PICKUP_ITEM, this, Priority.High, plugin); + pm.registerEvent(Event.Type.PLAYER_JOIN, this, Priority.Normal, plugin); + pm.registerEvent(Event.Type.PLAYER_LOGIN, this, Priority.Normal, plugin); + pm.registerEvent(Event.Type.PLAYER_QUIT, this, Priority.Normal, plugin); + pm.registerEvent(Event.Type.PLAYER_RESPAWN, this, Priority.High, plugin); + } + + /** * Called when a player joins a server * diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index 8030a978..46b06bc7 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -19,13 +19,10 @@ package com.sk89q.worldguard.bukkit; import java.util.logging.*; -import org.bukkit.event.Event.Priority; -import org.bukkit.event.Event; import org.bukkit.plugin.java.JavaPlugin; import com.sk89q.worldguard.bukkit.commands.CommandHandler; import com.sk89q.worldguard.protection.*; import com.sk89q.worldguard.protection.regionmanager.GlobalRegionManager; -import org.bukkit.plugin.PluginManager; /** * Plugin for Bukkit. @@ -55,7 +52,14 @@ public void onEnable() { getDataFolder().mkdirs(); globalRegionManager.onEnable(); - registerEvents(); + + playerListener.registerEvents(); + blockListener.registerEvents(); + entityListener.registerEvents(); + + // 25 equals about 1s real time + this.getServer().getScheduler().scheduleSyncRepeatingTask(this, new TimedFlagsTimer(this), 25 * 5, 25 * 5); + commandHandler.registerCommands(); logger.info("WorldGuard " + this.getDescription().getVersion() + " enabled."); @@ -71,40 +75,6 @@ public void onDisable() { logger.info("WorldGuard " + this.getDescription().getVersion() + " disabled."); } - /** - * Register used events. - */ - private void registerEvents() { - - PluginManager pm = getServer().getPluginManager(); - - pm.registerEvent(Event.Type.BLOCK_DAMAGED, blockListener, Priority.High, this); - pm.registerEvent(Event.Type.BLOCK_BREAK, blockListener, Priority.High, this); - pm.registerEvent(Event.Type.BLOCK_FLOW, blockListener, Priority.Normal, this); - pm.registerEvent(Event.Type.BLOCK_IGNITE, blockListener, Priority.High, this); - pm.registerEvent(Event.Type.BLOCK_PHYSICS, blockListener, Priority.Normal, this); - pm.registerEvent(Event.Type.BLOCK_INTERACT, blockListener, Priority.High, this); - pm.registerEvent(Event.Type.BLOCK_PLACED, blockListener, Priority.High, this); - pm.registerEvent(Event.Type.BLOCK_RIGHTCLICKED, blockListener, Priority.High, this); - pm.registerEvent(Event.Type.BLOCK_BURN, blockListener, Priority.High, this); - pm.registerEvent(Event.Type.REDSTONE_CHANGE, blockListener, Priority.High, this); - - pm.registerEvent(Event.Type.ENTITY_DAMAGED, entityListener, Priority.High, this); - pm.registerEvent(Event.Type.ENTITY_EXPLODE, entityListener, Priority.High, this); - pm.registerEvent(Event.Type.CREATURE_SPAWN, entityListener, Priority.High, this); - - pm.registerEvent(Event.Type.PLAYER_ITEM, playerListener, Priority.High, this); - pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Priority.High, this); - pm.registerEvent(Event.Type.PLAYER_PICKUP_ITEM, playerListener, Priority.High, this); - pm.registerEvent(Event.Type.PLAYER_JOIN, playerListener, Priority.Normal, this); - pm.registerEvent(Event.Type.PLAYER_LOGIN, playerListener, Priority.Normal, this); - pm.registerEvent(Event.Type.PLAYER_QUIT, playerListener, Priority.Normal, this); - pm.registerEvent(Event.Type.PLAYER_RESPAWN, playerListener, Priority.High, this); - - // 25 equals about 1s real time - this.getServer().getScheduler().scheduleSyncRepeatingTask(this, new TimedFlagsTimer(this), 25 * 5, 25 * 5); - } - /** * Get the GlobalRegionManager.