Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 13:15:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix more 1.1-R5 breaks...

Browse Source
This commit is contained in:
Mike Primm 2012-02-21 23:34:00 -06:00
parent fa80af8e81
commit 87bbd3023e
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/org/dynmap/bukkit/DynmapPlugin.java
View File

@ -149,6 +149,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break; break;
case WORLD_SPAWN_CHANGE: case WORLD_SPAWN_CHANGE:
pm.registerEvents(new Listener() { pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onSpawnChange(SpawnChangeEvent evt) { public void onSpawnChange(SpawnChangeEvent evt) {
DynmapWorld w = new BukkitWorld(evt.getWorld()); DynmapWorld w = new BukkitWorld(evt.getWorld());
@ -162,6 +163,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break; break;
case PLAYER_BED_LEAVE: case PLAYER_BED_LEAVE:
pm.registerEvents(new Listener() { pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onPlayerBedLeave(PlayerBedLeaveEvent evt) { public void onPlayerBedLeave(PlayerBedLeaveEvent evt) {
DynmapPlayer p = new BukkitPlayer(evt.getPlayer()); DynmapPlayer p = new BukkitPlayer(evt.getPlayer());
@ -171,6 +173,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break; break;
case PLAYER_CHAT: case PLAYER_CHAT:
pm.registerEvents(new Listener() { pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onPlayerChat(PlayerChatEvent evt) { public void onPlayerChat(PlayerChatEvent evt) {
if(evt.isCancelled()) return; if(evt.isCancelled()) return;
@ -183,6 +186,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break; break;
case BLOCK_BREAK: case BLOCK_BREAK:
pm.registerEvents(new Listener() { pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockBreak(BlockBreakEvent evt) { public void onBlockBreak(BlockBreakEvent evt) {
Block b = evt.getBlock(); Block b = evt.getBlock();
@ -194,6 +198,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
break; break;
case SIGN_CHANGE: case SIGN_CHANGE:
pm.registerEvents(new Listener() { pm.registerEvents(new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onSignChange(SignChangeEvent evt) { public void onSignChange(SignChangeEvent evt) {
Block b = evt.getBlock(); Block b = evt.getBlock();
@ -211,16 +216,19 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
Log.severe("Unhandled event type: " + type); Log.severe("Unhandled event type: " + type);
return false; return false;
} }
registered.add(type);
return true; return true;
} }
@Override @Override
public boolean sendWebChatEvent(String source, String name, String msg) { public boolean sendWebChatEvent(String source, String name, String msg) {
DynmapWebChatEvent evt = new DynmapWebChatEvent(source, name, msg); DynmapWebChatEvent evt = new DynmapWebChatEvent(source, name, msg);
Log.info("sendWebChatEvent(" + msg + ")");
getServer().getPluginManager().callEvent(evt); getServer().getPluginManager().callEvent(evt);
return (evt.isCancelled() == false); return (evt.isCancelled() == false);
} }
@Override @Override
public void broadcastMessage(String msg) { public void broadcastMessage(String msg) {
Log.info("broadcastMessage(" + msg + ")");
getServer().broadcastMessage(msg); getServer().broadcastMessage(msg);
} }
@Override @Override
@ -597,11 +605,13 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
private void registerPlayerLoginListener() { private void registerPlayerLoginListener() {
Listener pl = new Listener() { Listener pl = new Listener() {
@SuppressWarnings("unused")
@EventHandler @EventHandler
public void onPlayerJoin(PlayerJoinEvent evt) { public void onPlayerJoin(PlayerJoinEvent evt) {
DynmapPlayer dp = new BukkitPlayer(evt.getPlayer()); DynmapPlayer dp = new BukkitPlayer(evt.getPlayer());
core.listenerManager.processPlayerEvent(EventType.PLAYER_JOIN, dp); core.listenerManager.processPlayerEvent(EventType.PLAYER_JOIN, dp);
} }
@SuppressWarnings("unused")
@EventHandler @EventHandler
public void onPlayerQuit(PlayerQuitEvent evt) { public void onPlayerQuit(PlayerQuitEvent evt) {
DynmapPlayer dp = new BukkitPlayer(evt.getPlayer()); DynmapPlayer dp = new BukkitPlayer(evt.getPlayer());
@ -629,6 +639,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
private void registerEvents() { private void registerEvents() {
Listener blockTrigger = new Listener() { Listener blockTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockPlace(BlockPlaceEvent event) { public void onBlockPlace(BlockPlaceEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -641,6 +652,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockBreak(BlockBreakEvent event) { public void onBlockBreak(BlockBreakEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -653,6 +665,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onLeavesDecay(LeavesDecayEvent event) { public void onLeavesDecay(LeavesDecayEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -665,6 +678,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockBurn(BlockBurnEvent event) { public void onBlockBurn(BlockBurnEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -677,6 +691,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockForm(BlockFormEvent event) { public void onBlockForm(BlockFormEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -689,6 +704,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockFade(BlockFadeEvent event) { public void onBlockFade(BlockFadeEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -701,6 +717,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockSpread(BlockSpreadEvent event) { public void onBlockSpread(BlockSpreadEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -713,6 +730,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockFromTo(BlockFromToEvent event) { public void onBlockFromTo(BlockFromToEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -729,6 +747,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
mapManager.touch(wn, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), "blockfromto"); mapManager.touch(wn, loc.getBlockX(), loc.getBlockY(), loc.getBlockZ(), "blockfromto");
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockPhysics(BlockPhysicsEvent event) { public void onBlockPhysics(BlockPhysicsEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -741,6 +760,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockPistonRetract(BlockPistonRetractEvent event) { public void onBlockPistonRetract(BlockPistonRetractEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -768,6 +788,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onBlockPistonExtend(BlockPistonExtendEvent event) { public void onBlockPistonExtend(BlockPistonExtendEvent event) {
if(event.isCancelled()) if(event.isCancelled())
@ -813,6 +834,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
/* Register player event trigger handlers */ /* Register player event trigger handlers */
Listener playerTrigger = new Listener() { Listener playerTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
if(onplayerjoin) { if(onplayerjoin) {
@ -821,6 +843,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
core.listenerManager.processPlayerEvent(EventType.PLAYER_JOIN, new BukkitPlayer(event.getPlayer())); core.listenerManager.processPlayerEvent(EventType.PLAYER_JOIN, new BukkitPlayer(event.getPlayer()));
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
core.listenerManager.processPlayerEvent(EventType.PLAYER_QUIT, new BukkitPlayer(event.getPlayer())); core.listenerManager.processPlayerEvent(EventType.PLAYER_QUIT, new BukkitPlayer(event.getPlayer()));
@ -833,6 +856,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(onplayermove) { if(onplayermove) {
Listener playermove = new Listener() { Listener playermove = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
Location loc = event.getPlayer().getLocation(); Location loc = event.getPlayer().getLocation();
@ -844,6 +868,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
} }
/* Register entity event triggers */ /* Register entity event triggers */
Listener entityTrigger = new Listener() { Listener entityTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onEntityExplode(EntityExplodeEvent event) { public void onEntityExplode(EntityExplodeEvent event) {
Location loc = event.getLocation(); Location loc = event.getLocation();
@ -877,6 +902,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
/* Register world event triggers */ /* Register world event triggers */
Listener worldTrigger = new Listener() { Listener worldTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onWorldLoad(WorldLoadEvent event) { public void onWorldLoad(WorldLoadEvent event) {
core.updateConfigHashcode(); core.updateConfigHashcode();
@ -884,6 +910,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(core.processWorldLoad(w)) /* Have core process load first - fire event listeners if good load after */ if(core.processWorldLoad(w)) /* Have core process load first - fire event listeners if good load after */
core.listenerManager.processWorldEvent(EventType.WORLD_LOAD, w); core.listenerManager.processWorldEvent(EventType.WORLD_LOAD, w);
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onWorldUnload(WorldUnloadEvent event) { public void onWorldUnload(WorldUnloadEvent event) {
core.updateConfigHashcode(); core.updateConfigHashcode();
@ -891,6 +918,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
if(w != null) if(w != null)
core.listenerManager.processWorldEvent(EventType.WORLD_UNLOAD, w); core.listenerManager.processWorldEvent(EventType.WORLD_UNLOAD, w);
} }
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onStructureGrow(StructureGrowEvent event) { public void onStructureGrow(StructureGrowEvent event) {
Location loc = event.getLocation(); Location loc = event.getLocation();
@ -925,6 +953,7 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
ongeneratechunk = core.isTrigger("chunkgenerated"); ongeneratechunk = core.isTrigger("chunkgenerated");
if(ongeneratechunk) { if(ongeneratechunk) {
Listener chunkTrigger = new Listener() { Listener chunkTrigger = new Listener() {
@SuppressWarnings("unused")
@EventHandler(priority=EventPriority.MONITOR) @EventHandler(priority=EventPriority.MONITOR)
public void onChunkPopulate(ChunkPopulateEvent event) { public void onChunkPopulate(ChunkPopulateEvent event) {
Chunk c = event.getChunk(); Chunk c = event.getChunk();