twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-10 17:52:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed duplicate console and player messages when built in server commands where used or an unknown command was issued

Browse Source
This commit is contained in:
stevenh
2011-05-22 20:24:44 +01:00
parent 6319a19073
commit 8b0924bbb4
4 changed files with 77 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -695,19 +695,15 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
return;
}
boolean targetPluginFound = false;
try {
targetPluginFound = server.dispatchCommand(player, s.substring(1));
if (server.dispatchCommand(player, s.substring(1))) {
return;
}
} catch (CommandException ex) {
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to perform this command");
Logger.getLogger(NetServerHandler.class.getName()).log(Level.SEVERE, null, ex);
return;
}
if (targetPluginFound) {
return;
}
// CraftBukkit end
if (s.toLowerCase().startsWith("/me ")) {
@@ -728,9 +724,10 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
this.sendPacket(new Packet3Chat("\u00A7cThere\'s no player by that name online."));
}
}
/* CraftBukkit start - No longer neaded as we have already handled it server.dispatchCommand above.
} else {
String s1;
if (this.minecraftServer.serverConfigurationManager.isOp(this.player.name)) {
s1 = s.substring(1);
a.info(this.player.name + " issued server command: " + s1);
@@ -739,6 +736,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
s1 = s.substring(1);
a.info(this.player.name + " tried command: " + s1);
}
*/ // CraftBukkit end
}
}