diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/NetServerHandler.java | 6 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 1c1e8c37..7fd3e2ac 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -126,7 +126,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { if (lastPosX != Double.MAX_VALUE) { PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); server.getPluginManager().callEvent(event); - + from = event.getFrom(); to = event.isCancelled() ? from : event.getTo(); @@ -282,7 +282,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { Player player = getPlayer(); Location from = player.getLocation(); Location to = dest.clone(); - PlayerMoveEvent event = new PlayerMoveEvent(player, from, to); + PlayerTeleportEvent event = new PlayerTeleportEvent(player, from, to); server.getPluginManager().callEvent(event); from = event.getFrom(); @@ -593,7 +593,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener { // CraftBukkit start CraftPlayer player = getPlayer(); - PlayerChatEvent event = new PlayerChatEvent(player, s); + PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(player, s); server.getPluginManager().callEvent(event); if (event.isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 981d59c2..0db1ae86 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -18,7 +18,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.command.ColouredConsoleSender; import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerEvent; +import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerRespawnEvent; @@ -118,7 +118,7 @@ public class ServerConfigurationManager { // CraftBukkit start ((WorldServer) entityplayer.world).manager.b(entityplayer); - server.getPluginManager().callEvent(new PlayerEvent(PlayerEvent.Type.PLAYER_QUIT, server.getPlayer(entityplayer))); // CraftBukkit + server.getPluginManager().callEvent(new PlayerQuitEvent(server.getPlayer(entityplayer))); // CraftBukkit // CraftBukkit end } |