Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-16 21:10:30 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität

Fix chat decoding for legacy versions (#815)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Rocco 2022-08-03 15:19:30 +02:00 committet von GitHub
Ursprung 88a5abd26c
Commit 8344082b1a
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

7
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
Datei anzeigen

@ -180,13 +180,14 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
return server.getEventManager().fire(event) return server.getEventManager().fire(event)
.thenApply(pme -> { .thenApply(pme -> {
PlayerChatEvent.ChatResult chatResult = pme.getResult(); PlayerChatEvent.ChatResult chatResult = pme.getResult();
IdentifiedKey playerKey = player.getIdentifiedKey();
if (chatResult.isAllowed()) { if (chatResult.isAllowed()) {
Optional<String> eventMsg = pme.getResult().getMessage(); Optional<String> eventMsg = pme.getResult().getMessage();
if (eventMsg.isPresent()) { if (eventMsg.isPresent()) {
String messageNew = eventMsg.get(); String messageNew = eventMsg.get();
if (player.getIdentifiedKey() != null) { if (playerKey != null) {
if (signedMessage != null && !messageNew.equals(signedMessage.getMessage())) { if (signedMessage != null && !messageNew.equals(signedMessage.getMessage())) {
if (player.getIdentifiedKey().getKeyRevision().compareTo(IdentifiedKey.Revision.LINKED_V2) >= 0) { if (playerKey.getKeyRevision().compareTo(IdentifiedKey.Revision.LINKED_V2) >= 0) {
// Bad, very bad. // Bad, very bad.
logger.fatal("A plugin tried to change a signed chat message. " logger.fatal("A plugin tried to change a signed chat message. "
+ "This is no longer possible in 1.19.1 and newer. " + "This is no longer possible in 1.19.1 and newer. "
@ -209,7 +210,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
return original; return original;
} }
} else { } else {
if (player.getIdentifiedKey().getKeyRevision().compareTo(IdentifiedKey.Revision.LINKED_V2) >= 0) { if (playerKey != null && playerKey.getKeyRevision().compareTo(IdentifiedKey.Revision.LINKED_V2) >= 0) {
logger.fatal("A plugin tried to cancel a signed chat message." logger.fatal("A plugin tried to cancel a signed chat message."
+ " This is no longer possible in 1.19.1 and newer. " + " This is no longer possible in 1.19.1 and newer. "
+ "Disconnecting player " + player.getUsername()); + "Disconnecting player " + player.getUsername());