geforkt von Mirrors/Velocity
Fix chat decoding for legacy versions (#815)
Dieser Commit ist enthalten in:
Ursprung
88a5abd26c
Commit
8344082b1a
@ -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());
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren