Add PLAYER_INTERACT, remove BLOCK_RIGHT_CLICK, BLOCK_INTERACT and PLAYER_ITEM

By: Erik Broes <erikbroes@ripe.net>
This commit is contained in:
Bukkit/Spigot
2011-03-23 12:30:54 +01:00
parent 4819bb5819
commit 7824cc02e7
6 changed files with 222 additions and 45 deletions

View File

@@ -197,9 +197,9 @@ public final class JavaPluginLoader implements PluginLoader {
((PlayerListener)listener).onPlayerTeleport( (PlayerMoveEvent)event );
}
};
case PLAYER_ITEM:
case PLAYER_INTERACT:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((PlayerListener)listener).onPlayerItem( (PlayerItemEvent)event );
((PlayerListener)listener).onPlayerInteract( (PlayerInteractEvent)event );
}
};
case PLAYER_LOGIN:
@@ -266,11 +266,6 @@ public final class JavaPluginLoader implements PluginLoader {
((BlockListener)listener).onBlockCanBuild( (BlockCanBuildEvent)event );
}
};
case BLOCK_RIGHTCLICK:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((BlockListener)listener).onBlockRightClick( (BlockRightClickEvent)event );
}
};
case BLOCK_PLACE:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((BlockListener)listener).onBlockPlace( (BlockPlaceEvent)event );
@@ -281,11 +276,6 @@ public final class JavaPluginLoader implements PluginLoader {
((BlockListener)listener).onBlockDamage( (BlockDamageEvent)event );
}
};
case BLOCK_INTERACT:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((BlockListener)listener).onBlockInteract( (BlockInteractEvent)event );
}
};
case BLOCK_FROMTO:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((BlockListener)listener).onBlockFlow( (BlockFromToEvent)event );