Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 19:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Lowered the priority of the old command handler event. A number of plugins were using this event incorrectly. A new event, the command preprocesser event, has replaced the previous function of the original command event.

Browse Source
This commit is contained in:
sk89q 2011-02-19 01:40:32 -08:00
parent acd0344452
commit d4b67c5549
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/minecraft/server/NetServerHandler.java
View File

@ -622,7 +622,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit start // CraftBukkit start
CraftPlayer player = getPlayer(); CraftPlayer player = getPlayer();
PlayerChatEvent event = new PlayerChatEvent(Type.PLAYER_COMMAND, player, s); PlayerChatEvent event = new PlayerChatEvent(Type.PLAYER_COMMAND_PREPROCESS, player, s);
server.getPluginManager().callEvent(event); server.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
return; return;
@ -641,6 +641,14 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
if (targetPluginFound) { if (targetPluginFound) {
return; return;
} }
// Legacy command handler
event = new PlayerChatEvent(Type.PLAYER_COMMAND, player, s);
server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
s = event.getMessage(); s = event.getMessage();
player = (CraftPlayer) event.getPlayer(); player = (CraftPlayer) event.getPlayer();
EntityPlayer e = player.getHandle(); EntityPlayer e = player.getHandle();