OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make a start on block events, fixed nullcheck in PluginManager

Browse source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
Bukkit/Spigot 2010-12-28 21:02:39 +00:00
parent 695bda59ee
commit b63f46250a
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
paper-api/src/org/bukkit/event/Event.java
View file

@ -71,17 +71,18 @@ public abstract class Event {
PLAYER_COMMAND (Category.PLAYER), PLAYER_COMMAND (Category.PLAYER),
PLAYER_QUIT (Category.PLAYER), PLAYER_QUIT (Category.PLAYER),
PLAYER_MOVE (Category.PLAYER), PLAYER_MOVE (Category.PLAYER),
PLAYER_ANIMATION (Category.PLAYER), //PLAYER_ANIMATION (Category.PLAYER),
PLAYER_TELEPORT (Category.PLAYER); PLAYER_TELEPORT (Category.PLAYER),
/** /**
* Block Events * Block Events
*/
BLOCK_DESTROYED (Category.BLOCK), BLOCK_DAMAGED (Category.BLOCK),
BLOCK_BROKEN (Category.BLOCK), BLOCK_PLACED (Category.BLOCK),
BLOCK_PLACE (Category.BLOCK),
BLOCK_RIGHTCLICKED (Category.BLOCK), BLOCK_RIGHTCLICKED (Category.BLOCK),
REDSTONE_CHANGE (Category.BLOCK),
BLOCK_PHYSICS (Category.BLOCK), BLOCK_PHYSICS (Category.BLOCK),
REDSTONE_CHANGE (Category.BLOCK),
BLOCK_IGNITE (Category.BLOCK),
BLOCK_FLOW (Category.BLOCK);
/** /**
* Item Events * Item Events

2
paper-api/src/org/bukkit/plugin/SimplePluginManager.java
View file

@ -170,7 +170,7 @@ public final class SimplePluginManager implements PluginManager {
public void callEvent(Event event) { public void callEvent(Event event) {
List<RegisteredListener> eventListeners = listeners.get(event.getType()); List<RegisteredListener> eventListeners = listeners.get(event.getType());
if (listeners != null) { if (eventListeners != null) {
for (RegisteredListener registration : eventListeners) { for (RegisteredListener registration : eventListeners) {
Plugin plugin = registration.getPlugin(); Plugin plugin = registration.getPlugin();
PluginLoader loader = plugin.getPluginLoader(); PluginLoader loader = plugin.getPluginLoader();