SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Follow vanilla settings behavior. Fixes BUKKIT-5069

Quellcode durchsuchen 
A vanilla server does a series of checks for the client black-listing
certain chat types (commands or chat). This change changes a CB
whitelist to the vanilla blacklist behavior.
Dieser Commit ist enthalten in:
Wesley Wolfe 2013-12-06 16:44:32 -06:00
Ursprung dc86362c9a
Commit 70747ca28b
1 geänderte Dateien mit 58 neuen und 60 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

118
src/main/java/net/minecraft/server/PlayerConnection.java
Datei anzeigen

@ -758,7 +758,7 @@ public class PlayerConnection implements PacketPlayInListener {
} }
public void a(PacketPlayInChat packetplayinchat) { public void a(PacketPlayInChat packetplayinchat) {
if (this.player.getChatFlags() == EnumChatVisibility.HIDDEN) { if (this.player.dead || this.player.getChatFlags() == EnumChatVisibility.HIDDEN) { // CraftBukkit - dead men tell no tales
ChatMessage chatmessage = new ChatMessage("chat.cannotSend", new Object[0]); ChatMessage chatmessage = new ChatMessage("chat.cannotSend", new Object[0]);
chatmessage.b().setColor(EnumChatFormat.RED); chatmessage.b().setColor(EnumChatFormat.RED);
@ -835,73 +835,71 @@ public class PlayerConnection implements PacketPlayInListener {
// CraftBukkit start // CraftBukkit start
public void chat(String s, boolean async) { public void chat(String s, boolean async) {
if (s.isEmpty()) { if (s.isEmpty() || this.player.getChatFlags() == EnumChatVisibility.HIDDEN) {
return; return;
} }
if (!this.player.dead) { if (s.startsWith("/")) {
if (s.startsWith("/")) { this.handleCommand(s);
this.handleCommand(s); } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
} else if (this.player.getChatFlags() != EnumChatVisibility.FULL) { // Do nothing, this is coming from a plugin
// Do nothing, this is coming from a plugin } else {
} else { Player player = this.getPlayer();
Player player = this.getPlayer(); AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet());
AsyncPlayerChatEvent event = new AsyncPlayerChatEvent(async, player, s, new LazyPlayerSet()); this.server.getPluginManager().callEvent(event);
this.server.getPluginManager().callEvent(event);
if (PlayerChatEvent.getHandlerList().getRegisteredListeners().length != 0) { if (PlayerChatEvent.getHandlerList().getRegisteredListeners().length != 0) {
// Evil plugins still listening to deprecated event // Evil plugins still listening to deprecated event
final PlayerChatEvent queueEvent = new PlayerChatEvent(player, event.getMessage(), event.getFormat(), event.getRecipients()); final PlayerChatEvent queueEvent = new PlayerChatEvent(player, event.getMessage(), event.getFormat(), event.getRecipients());
queueEvent.setCancelled(event.isCancelled()); queueEvent.setCancelled(event.isCancelled());
Waitable waitable = new Waitable() { Waitable waitable = new Waitable() {
@Override @Override
protected Object evaluate() { protected Object evaluate() {
org.bukkit.Bukkit.getPluginManager().callEvent(queueEvent); org.bukkit.Bukkit.getPluginManager().callEvent(queueEvent);
if (queueEvent.isCancelled()) { if (queueEvent.isCancelled()) {
return null;
}
String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage());
PlayerConnection.this.minecraftServer.console.sendMessage(message);
if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
((EntityPlayer) player).sendMessage(CraftChatMessage.fromString(message));
}
} else {
for (Player player : queueEvent.getRecipients()) {
player.sendMessage(message);
}
}
return null; return null;
}}; }
if (async) {
minecraftServer.processQueue.add(waitable); String message = String.format(queueEvent.getFormat(), queueEvent.getPlayer().getDisplayName(), queueEvent.getMessage());
} else { PlayerConnection.this.minecraftServer.console.sendMessage(message);
waitable.run(); if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
} for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
try { ((EntityPlayer) player).sendMessage(CraftChatMessage.fromString(message));
waitable.get(); }
} catch (InterruptedException e) { } else {
Thread.currentThread().interrupt(); // This is proper habit for java. If we aren't handling it, pass it on! for (Player player : queueEvent.getRecipients()) {
} catch (ExecutionException e) { player.sendMessage(message);
throw new RuntimeException("Exception processing chat event", e.getCause()); }
}
return null;
}};
if (async) {
minecraftServer.processQueue.add(waitable);
} else {
waitable.run();
}
try {
waitable.get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt(); // This is proper habit for java. If we aren't handling it, pass it on!
} catch (ExecutionException e) {
throw new RuntimeException("Exception processing chat event", e.getCause());
}
} else {
if (event.isCancelled()) {
return;
}
s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
minecraftServer.console.sendMessage(s);
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) {
((EntityPlayer) recipient).sendMessage(CraftChatMessage.fromString(s));
} }
} else { } else {
if (event.isCancelled()) { for (Player recipient : event.getRecipients()) {
return; recipient.sendMessage(s);
}
s = String.format(event.getFormat(), event.getPlayer().getDisplayName(), event.getMessage());
minecraftServer.console.sendMessage(s);
if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
for (Object recipient : minecraftServer.getPlayerList().players) {
((EntityPlayer) recipient).sendMessage(CraftChatMessage.fromString(s));
}
} else {
for (Player recipient : event.getRecipients()) {
recipient.sendMessage(s);
}
} }
} }
} }