twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 20:23:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

move early checks

Browse Source
This commit is contained in:
Nassim Jahnke
2025-05-23 17:11:54 +02:00
parent 5f210bb2d6
commit eb180d5aeb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
View File

@@ -1462,7 +1462,7 @@
public void handleChatCommand(ServerboundChatCommandPacket packet) { public void handleChatCommand(ServerboundChatCommandPacket packet) {
this.tryHandleChat(packet.command(), () -> { this.tryHandleChat(packet.command(), () -> {
+ // CraftBukkit start - SPIGOT-7346: Prevent disconnected players from executing commands + // CraftBukkit start - SPIGOT-7346: Prevent disconnected players from executing commands
+ if (this.player.hasDisconnected()) { + if (this.player.hasDisconnected() || this.player.isRemoved()) {
+ return; + return;
+ } + }
+ // CraftBukkit end + // CraftBukkit end
@@ -1482,10 +1482,10 @@
+ +
+ PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(this.getCraftPlayer(), prefixedCommand, new org.bukkit.craftbukkit.util.LazyPlayerSet(this.server)); + PlayerCommandPreprocessEvent event = new PlayerCommandPreprocessEvent(this.getCraftPlayer(), prefixedCommand, new org.bukkit.craftbukkit.util.LazyPlayerSet(this.server));
+ this.cserver.getPluginManager().callEvent(event); + this.cserver.getPluginManager().callEvent(event);
+
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ return; + return;
+ } + }
+
+ command = event.getMessage().substring(1); + command = event.getMessage().substring(1);
+ // CraftBukkit end + // CraftBukkit end
ParseResults<CommandSourceStack> parseResults = this.parseCommand(command); ParseResults<CommandSourceStack> parseResults = this.parseCommand(command);
@@ -1531,7 +1531,7 @@
Map<String, PlayerChatMessage> map; Map<String, PlayerChatMessage> map;
try { try {
map = this.collectSignedArguments(packet, SignableCommand.of(parseResults), lastSeenMessages); map = this.collectSignedArguments(packet, SignableCommand.of(parseResults), lastSeenMessages);
@@ -1433,11 +_,24 @@ @@ -1433,11 +_,28 @@
return; return;
} }
@@ -1542,6 +1542,10 @@
+ } + }
+ +
+ private void performSignedChatCommand(ServerboundChatCommandSignedPacket packet, ParseResults<CommandSourceStack> parseResults, String command, Map<String, PlayerChatMessage> map) { + private void performSignedChatCommand(ServerboundChatCommandSignedPacket packet, ParseResults<CommandSourceStack> parseResults, String command, Map<String, PlayerChatMessage> map) {
+ if (this.player.hasDisconnected() || this.player.isRemoved()) {
+ return;
+ }
+
+ // Remove signed parts if the command was changed + // Remove signed parts if the command was changed
+ if (!command.equals(packet.command())) { + if (!command.equals(packet.command())) {
+ parseResults = this.parseCommand(command); + parseResults = this.parseCommand(command);
@@ -1565,9 +1569,8 @@
+ private void tryHandleChat(String message, Runnable handler, boolean sync) { // CraftBukkit + private void tryHandleChat(String message, Runnable handler, boolean sync) { // CraftBukkit
if (isChatMessageIllegal(message)) { if (isChatMessageIllegal(message)) {
- this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters")); - this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"));
- } else if (this.player.getChatVisibility() == ChatVisiblity.HIDDEN) {
+ this.disconnectAsync(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add proper async disconnect + this.disconnectAsync(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add proper async disconnect
+ } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales } else if (this.player.getChatVisibility() == ChatVisiblity.HIDDEN) {
this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false)); this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
} else { } else {
this.player.resetLastActionTime(); this.player.resetLastActionTime();