Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-16 13:00:06 +01:00
Code Issues Projekte Releases Wiki Aktivität

Don't wait for main thread when processing commands.

Quellcode durchsuchen 
In order to correctly handle disconnects for invalid chat we setup a
Waitable and pass it to the main thread then wait for it to be processed.
However, commands are also chat packets and they are already on the main
thread. In this case, waiting will deadlock the server so we should just
do a normal disconnect.
Dieser Commit ist enthalten in:
Travis Watkins 2012-11-17 11:48:22 -06:00
Ursprung 9add7d3000
Commit 558411692a
1 geänderte Dateien mit 57 neuen und 45 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

102
src/main/java/net/minecraft/server/NetServerHandler.java
Datei anzeigen

@ -794,22 +794,26 @@ public class NetServerHandler extends NetHandler {
if (s.length() > 100) {
// CraftBukkit start
Waitable waitable = new Waitable() {
@Override
protected Object evaluate() {
NetServerHandler.this.disconnect("Chat message too long");
return null;
if (packet3chat.a_()) {
Waitable waitable = new Waitable() {
@Override
protected Object evaluate() {
NetServerHandler.this.disconnect("Chat message too long");
return null;
}
};
this.minecraftServer.processQueue.add(waitable);
try {
waitable.get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
throw new RuntimeException(e);
}
};
this.minecraftServer.processQueue.add(waitable);
try {
waitable.get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
throw new RuntimeException(e);
} else {
this.disconnect("Chat message too long");
}
// CraftBukkit end
} else {
@ -818,22 +822,26 @@ public class NetServerHandler extends NetHandler {
for (int i = 0; i < s.length(); ++i) {
if (!SharedConstants.isAllowedChatCharacter(s.charAt(i))) {
// CraftBukkit start
Waitable waitable = new Waitable() {
@Override
protected Object evaluate() {
NetServerHandler.this.disconnect("Illegal characters in chat");
return null;
if (packet3chat.a_()) {
Waitable waitable = new Waitable() {
@Override
protected Object evaluate() {
NetServerHandler.this.disconnect("Illegal characters in chat");
return null;
}
};
this.minecraftServer.processQueue.add(waitable);
try {
waitable.get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
throw new RuntimeException(e);
}
};
this.minecraftServer.processQueue.add(waitable);
try {
waitable.get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
throw new RuntimeException(e);
} else {
this.disconnect("Illegal characters in chat");
}
// CraftBukkit end
return;
@ -851,22 +859,26 @@ public class NetServerHandler extends NetHandler {
// This section stays because it is only applicable to packets
if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getServerConfigurationManager().isOp(this.player.name)) { // CraftBukkit use thread-safe spam
// CraftBukkit start
Waitable waitable = new Waitable() {
@Override
protected Object evaluate() {
NetServerHandler.this.disconnect("disconnect.spam");
return null;
if (packet3chat.a_()) {
Waitable waitable = new Waitable() {
@Override
protected Object evaluate() {
NetServerHandler.this.disconnect("disconnect.spam");
return null;
}
};
this.minecraftServer.processQueue.add(waitable);
try {
waitable.get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
throw new RuntimeException(e);
}
};
this.minecraftServer.processQueue.add(waitable);
try {
waitable.get();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
} catch (ExecutionException e) {
throw new RuntimeException(e);
} else {
this.disconnect("disconnect.spam");
}
// CraftBukkit end
}