diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2010-12-28 21:02:39 +0000 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2010-12-28 21:02:39 +0000 |
| commit | caf0d3e27a11a279b0439a988cabd49420ec4b6e (patch) | |
| tree | 9efd15c5e4e9187c9eded501b2d8258312ae2872 /src | |
| parent | 1ce00ae0741d7a8cf6218ead0f86ad27b6ed1d7d (diff) | |
| download | bukkit-caf0d3e27a11a279b0439a988cabd49420ec4b6e.tar bukkit-caf0d3e27a11a279b0439a988cabd49420ec4b6e.tar.gz bukkit-caf0d3e27a11a279b0439a988cabd49420ec4b6e.tar.lz bukkit-caf0d3e27a11a279b0439a988cabd49420ec4b6e.tar.xz bukkit-caf0d3e27a11a279b0439a988cabd49420ec4b6e.zip | |
Make a start on block events, fixed nullcheck in PluginManager
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/bukkit/event/Event.java | 15 | ||||
| -rw-r--r-- | src/org/bukkit/plugin/SimplePluginManager.java | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/org/bukkit/event/Event.java b/src/org/bukkit/event/Event.java index f9d8b46a..f823b08b 100644 --- a/src/org/bukkit/event/Event.java +++ b/src/org/bukkit/event/Event.java @@ -71,17 +71,18 @@ public abstract class Event { PLAYER_COMMAND (Category.PLAYER), PLAYER_QUIT (Category.PLAYER), PLAYER_MOVE (Category.PLAYER), - PLAYER_ANIMATION (Category.PLAYER), - PLAYER_TELEPORT (Category.PLAYER); + //PLAYER_ANIMATION (Category.PLAYER), + PLAYER_TELEPORT (Category.PLAYER), /** * Block Events - - BLOCK_DESTROYED (Category.BLOCK), - BLOCK_BROKEN (Category.BLOCK), - BLOCK_PLACE (Category.BLOCK), + */ + BLOCK_DAMAGED (Category.BLOCK), + BLOCK_PLACED (Category.BLOCK), BLOCK_RIGHTCLICKED (Category.BLOCK), - REDSTONE_CHANGE (Category.BLOCK), BLOCK_PHYSICS (Category.BLOCK), + REDSTONE_CHANGE (Category.BLOCK), + BLOCK_IGNITE (Category.BLOCK), + BLOCK_FLOW (Category.BLOCK); /** * Item Events diff --git a/src/org/bukkit/plugin/SimplePluginManager.java b/src/org/bukkit/plugin/SimplePluginManager.java index 5cbe08b3..cc696f61 100644 --- a/src/org/bukkit/plugin/SimplePluginManager.java +++ b/src/org/bukkit/plugin/SimplePluginManager.java @@ -170,7 +170,7 @@ public final class SimplePluginManager implements PluginManager { public void callEvent(Event event) { List<RegisteredListener> eventListeners = listeners.get(event.getType()); - if (listeners != null) { + if (eventListeners != null) { for (RegisteredListener registration : eventListeners) { Plugin plugin = registration.getPlugin(); PluginLoader loader = plugin.getPluginLoader(); |