Skip to content

Ver/1.20.6 #11430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DersWasTaken wants to merge 5 commits into from
Closed

Ver/1.20.6 #11430

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
560ecd6
Fix BasicCommand suggestion arg count
whimxiqal Sep 16, 2024
76dab02
Fix BasicCommand suggestion arg count
whimxiqal Sep 16, 2024
55d5e32
Merge remote-tracking branch 'origin/ver/1.20.6' into ver/1.20.6
Sep 22, 2024
704838c
Merge remote-tracking branch 'origin/ver/1.20.6' into ver/1.20.6
Sep 22, 2024
af7ba40
Merge remote-tracking branch 'origin/ver/1.20.6' into ver/1.20.6
Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions patches/server/0554-Add-PlayerKickEvent-causes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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
}

}
Expand Down