|
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Add configuration option to disable chat signatures
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
|
|
|
|
|
index c87b708c368713a23a10ad97704575ee4df27891..a650bdccc7f8fe77abe2750c9939f5eb0ccfd57b 100644
|
|
|
|
|
index c87b708c368713a23a10ad97704575ee4df27891..4a8ab800d4a974aaf14872d50dcf01c806a0fe3b 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java
|
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
@ -15,7 +15,7 @@ index c87b708c368713a23a10ad97704575ee4df27891..a650bdccc7f8fe77abe2750c9939f5eb
|
|
|
|
|
import net.minecraft.server.level.ServerPlayer;
|
|
|
|
|
|
|
|
|
|
public interface OutgoingChatMessage {
|
|
|
|
|
@@ -46,9 +47,20 @@ public interface OutgoingChatMessage {
|
|
|
|
|
@@ -46,9 +47,19 @@ public interface OutgoingChatMessage {
|
|
|
|
|
// Paper end
|
|
|
|
|
PlayerChatMessage playerChatMessage = this.message.filter(filterMaskEnabled);
|
|
|
|
|
playerChatMessage = unsigned != null ? playerChatMessage.withUnsignedContent(unsigned) : playerChatMessage; // Paper
|
|
|
|
@ -30,8 +30,7 @@ index c87b708c368713a23a10ad97704575ee4df27891..a650bdccc7f8fe77abe2750c9939f5eb
|
|
|
|
|
+ null,
|
|
|
|
|
+ SignedMessageBody.unsigned(playerChatMessage.signedContent()),
|
|
|
|
|
+ unsigned,
|
|
|
|
|
+ playerChatMessage.filterMask(),
|
|
|
|
|
+ playerChatMessage.result()
|
|
|
|
|
+ playerChatMessage.filterMask()
|
|
|
|
|
+ ), params);
|
|
|
|
|
+ // Scissors end
|
|
|
|
|
}
|
|
|
|
@ -60,7 +59,7 @@ index 0af9ed92824ccf30814eceb6a2c2e5c12661c991..c92374104b4aed2f952b250c5559ab9c
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
|
index adbb1036913ba6299f2093c84480e4147a36b344..8d5f4f2a0589c9c34dcff0ca95b6222b90f7d09a 100644
|
|
|
|
|
index 80f0f88258770862f419e4faba4cfca4c0457b2c..c0aa9520d547d6d77169fd1dbb02844b90ef4a1d 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
|
|
|
@@ -1,5 +1,6 @@
|
|
|
|
@ -95,7 +94,7 @@ index adbb1036913ba6299f2093c84480e4147a36b344..8d5f4f2a0589c9c34dcff0ca95b6222b
|
|
|
|
|
ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString());
|
|
|
|
|
this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes
|
|
|
|
|
}
|
|
|
|
|
@@ -3460,6 +3463,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
|
|
|
@@ -3473,6 +3476,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
|
|
|
@Override
|
|
|
|
|
public void handleChatSessionUpdate(ServerboundChatSessionUpdatePacket packet) {
|
|
|
|
|
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel());
|
|
|
|
|