From 560ecd6f94bd074d29cb45167f7befb4c7ab59ea Mon Sep 17 00:00:00 2001 From: Pieter Svenson Date: Mon, 16 Sep 2024 12:02:12 -0700 Subject: [PATCH 1/2] Fix BasicCommand suggestion arg count Resolves: #11211 Backport-of: #11241 --- patches/server/0554-Add-PlayerKickEvent-causes.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/server/0554-Add-PlayerKickEvent-causes.patch b/patches/server/0554-Add-PlayerKickEvent-causes.patch index 2c7c43865b69..ff89e754aee8 100644 --- a/patches/server/0554-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0554-Add-PlayerKickEvent-causes.patch @@ -222,7 +222,7 @@ index 661765a9fe1c2e49299262190501ee3b3294a2f1..7659a3f50f5a90814dc7331ea00d6251 if (this.cserver.getServer().isRunning()) { this.cserver.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index eeb30a6e015dc16553248701e12db2820a70a1aa..eb13c0e8feb4a6933ae6063a2208b694cf29a342 100644 +index eeb30a6e015dc16553248701e12db2820a70a1aa..4b23e70e5dcb3ad77c284cc54674af6ea3bb09d1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -349,7 +349,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -346,7 +346,7 @@ index eeb30a6e015dc16553248701e12db2820a70a1aa..eb13c0e8feb4a6933ae6063a2208b694 if (optional.isEmpty()) { ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); - this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED); -+ this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes ++ ServerGamePacketListenerImpl.LOGGER.info("Server attempted to kick {} for a Chat Validation Error..", this.player.getName().getString()); // Paper - kick event causes } return optional; @@ -364,7 +364,7 @@ index eeb30a6e015dc16553248701e12db2820a70a1aa..eb13c0e8feb4a6933ae6063a2208b694 if (!this.lastSeenMessages.applyOffset(packet.offset())) { ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); - this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED); -+ this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes ++ ServerGamePacketListenerImpl.LOGGER.info("Server attempted to kick {} for a Chat Validation Error..", this.player.getName().getString()); // Paper - kick event causes } } From 76dab0291e6a513200791d34b179e771da12242e Mon Sep 17 00:00:00 2001 From: Pieter Svenson Date: Mon, 16 Sep 2024 12:02:12 -0700 Subject: [PATCH 2/2] Fix BasicCommand suggestion arg count Resolves: #11211 Backport-of: #11241 --- patches/server/0554-Add-PlayerKickEvent-causes.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/server/0554-Add-PlayerKickEvent-causes.patch b/patches/server/0554-Add-PlayerKickEvent-causes.patch index 2c7c43865b69..ff89e754aee8 100644 --- a/patches/server/0554-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0554-Add-PlayerKickEvent-causes.patch @@ -222,7 +222,7 @@ index 661765a9fe1c2e49299262190501ee3b3294a2f1..7659a3f50f5a90814dc7331ea00d6251 if (this.cserver.getServer().isRunning()) { this.cserver.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index eeb30a6e015dc16553248701e12db2820a70a1aa..eb13c0e8feb4a6933ae6063a2208b694cf29a342 100644 +index eeb30a6e015dc16553248701e12db2820a70a1aa..4b23e70e5dcb3ad77c284cc54674af6ea3bb09d1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -349,7 +349,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -346,7 +346,7 @@ index eeb30a6e015dc16553248701e12db2820a70a1aa..eb13c0e8feb4a6933ae6063a2208b694 if (optional.isEmpty()) { ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); - this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED); -+ this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes ++ ServerGamePacketListenerImpl.LOGGER.info("Server attempted to kick {} for a Chat Validation Error..", this.player.getName().getString()); // Paper - kick event causes } return optional; @@ -364,7 +364,7 @@ index eeb30a6e015dc16553248701e12db2820a70a1aa..eb13c0e8feb4a6933ae6063a2208b694 if (!this.lastSeenMessages.applyOffset(packet.offset())) { ServerGamePacketListenerImpl.LOGGER.warn("Failed to validate message acknowledgements from {}", this.player.getName().getString()); - this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED); -+ this.disconnect(ServerGamePacketListenerImpl.CHAT_VALIDATION_FAILED, org.bukkit.event.player.PlayerKickEvent.Cause.CHAT_VALIDATION_FAILED); // Paper - kick event causes ++ ServerGamePacketListenerImpl.LOGGER.info("Server attempted to kick {} for a Chat Validation Error..", this.player.getName().getString()); // Paper - kick event causes } }