Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make a start on block events, fixed nullcheck in PluginManager

Browse Source
This commit is contained in:
Dinnerbone 2010-12-28 21:02:39 +00:00
parent 1ce00ae074
commit caf0d3e27a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/bukkit/event/Event.java
View File

@ -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

2
src/org/bukkit/plugin/SimplePluginManager.java
View File

@ -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();