Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Changed events for the latest Bukkit changes.

Browse source
This commit is contained in:
FrozenCow 2011-03-28 18:27:11 +02:00
parent 1fe5f99250
commit 86caf7c550
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/dynmap/DynmapPlayerChatListener.java
View file

@ -1,8 +1,9 @@
package org.dynmap; package org.dynmap;
import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerChatEvent;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerListener; import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerQuitEvent;
public class DynmapPlayerChatListener extends PlayerListener { public class DynmapPlayerChatListener extends PlayerListener {
DynmapPlugin plugin; DynmapPlugin plugin;
@ -18,14 +19,14 @@ public class DynmapPlayerChatListener extends PlayerListener {
} }
@Override @Override
public void onPlayerJoin(PlayerEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
String joinMessage = plugin.configuration.getString("joinmessage", "%playername% joined"); String joinMessage = plugin.configuration.getString("joinmessage", "%playername% joined");
joinMessage = joinMessage.replaceAll("%playername%", event.getPlayer().getName()); joinMessage = joinMessage.replaceAll("%playername%", event.getPlayer().getName());
plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", joinMessage)); plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", joinMessage));
} }
@Override @Override
public void onPlayerQuit(PlayerEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
String quitMessage = plugin.configuration.getString("quitmessage", "%playername% quit"); String quitMessage = plugin.configuration.getString("quitmessage", "%playername% quit");
quitMessage = quitMessage.replaceAll("%playername%", event.getPlayer().getName()); quitMessage = quitMessage.replaceAll("%playername%", event.getPlayer().getName());
plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", quitMessage)); plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", quitMessage));

16
src/main/java/org/dynmap/DynmapPlugin.java
View file

@ -26,12 +26,12 @@ import org.bukkit.event.Event.Priority;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockListener;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerListener; import org.bukkit.event.player.PlayerListener;
import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.ChunkLoadEvent;
import org.bukkit.event.world.WorldEvent;
import org.bukkit.event.world.WorldListener; import org.bukkit.event.world.WorldListener;
import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.util.config.Configuration; import org.bukkit.util.config.Configuration;
@ -192,14 +192,14 @@ public class DynmapPlugin extends JavaPlugin {
} }
}; };
if (isTrigger("blockplaced")) if (isTrigger("blockplaced"))
pm.registerEvent(Event.Type.BLOCK_PLACED, renderTrigger, Priority.Monitor, this); pm.registerEvent(Event.Type.BLOCK_PLACE, renderTrigger, Priority.Monitor, this);
if (isTrigger("blockbreak")) if (isTrigger("blockbreak"))
pm.registerEvent(Event.Type.BLOCK_BREAK, renderTrigger, Priority.Monitor, this); pm.registerEvent(Event.Type.BLOCK_BREAK, renderTrigger, Priority.Monitor, this);
} }
{ {
PlayerListener renderTrigger = new PlayerListener() { PlayerListener renderTrigger = new PlayerListener() {
@Override @Override
public void onPlayerJoin(PlayerEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
mm.touch(event.getPlayer().getLocation()); mm.touch(event.getPlayer().getLocation());
} }
@ -216,7 +216,7 @@ public class DynmapPlugin extends JavaPlugin {
{ {
WorldListener renderTrigger = new WorldListener() { WorldListener renderTrigger = new WorldListener() {
@Override @Override
public void onChunkLoaded(ChunkLoadEvent event) { public void onChunkLoad(ChunkLoadEvent event) {
int x = event.getChunk().getX() * 16 + 8; int x = event.getChunk().getX() * 16 + 8;
int z = event.getChunk().getZ() * 16 + 8; int z = event.getChunk().getZ() * 16 + 8;
mm.touch(new Location(event.getWorld(), x, 127, z)); mm.touch(new Location(event.getWorld(), x, 127, z));
@ -230,7 +230,7 @@ public class DynmapPlugin extends JavaPlugin {
*/ */
}; };
if (isTrigger("chunkloaded")) if (isTrigger("chunkloaded"))
pm.registerEvent(Event.Type.CHUNK_LOADED, renderTrigger, Priority.Monitor, this); pm.registerEvent(Event.Type.CHUNK_LOAD, renderTrigger, Priority.Monitor, this);
//if (isTrigger("chunkgenerated")) pm.registerEvent(Event.Type.CHUNK_GENERATED, renderTrigger, Priority.Monitor, this); //if (isTrigger("chunkgenerated")) pm.registerEvent(Event.Type.CHUNK_GENERATED, renderTrigger, Priority.Monitor, this);
} }
@ -248,11 +248,11 @@ public class DynmapPlugin extends JavaPlugin {
// To link configuration to real loaded worlds. // To link configuration to real loaded worlds.
WorldListener worldListener = new WorldListener() { WorldListener worldListener = new WorldListener() {
@Override @Override
public void onWorldLoaded(WorldEvent event) { public void onWorldLoad(WorldLoadEvent event) {
mm.activateWorld(event.getWorld()); mm.activateWorld(event.getWorld());
} }
}; };
pm.registerEvent(Event.Type.WORLD_LOADED, worldListener, Priority.Monitor, this); pm.registerEvent(Event.Type.WORLD_LOAD, worldListener, Priority.Monitor, this);
} }
private static File combinePaths(File parent, String path) { private static File combinePaths(File parent, String path) {