From b60cf52c33ee0c9724ee38b2719fa052e8fdd787 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 22 Jun 2021 19:35:35 +0100 Subject: [PATCH] Fix kick event being fired off main thread --- ...ck-event-being-fired-off-main-thread.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 patches/server/0719-Fix-kick-event-being-fired-off-main-thread.patch diff --git a/patches/server/0719-Fix-kick-event-being-fired-off-main-thread.patch b/patches/server/0719-Fix-kick-event-being-fired-off-main-thread.patch new file mode 100644 index 000000000..579beb829 --- /dev/null +++ b/patches/server/0719-Fix-kick-event-being-fired-off-main-thread.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shane Freeder +Date: Tue, 22 Jun 2021 19:32:19 +0100 +Subject: [PATCH] Fix kick event being fired off main thread + + +diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +index 0c295854f31422cf3ad699d229805c5881a65eed..c4fcab527c35eee94f88c7e499b9d2959d704808 100644 +--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java ++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +@@ -108,6 +108,7 @@ import net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket; + import net.minecraft.network.protocol.game.ServerboundUseItemOnPacket; + import net.minecraft.network.protocol.game.ServerboundUseItemPacket; + import net.minecraft.resources.ResourceLocation; ++import net.minecraft.server.MCUtil; + import net.minecraft.server.MinecraftServer; + import net.minecraft.server.level.ServerLevel; + import net.minecraft.server.level.ServerPlayer; +@@ -440,11 +441,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser + } + net.kyori.adventure.text.Component leaveMessage = net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, this.player.getBukkitEntity().displayName()); // Paper - Adventure + +- PlayerKickEvent event = new PlayerKickEvent(this.player.getBukkitEntity(), reason, leaveMessage, cause); // Paper - Adventure & kick event reason ++ // Paper start - ensire kick event is fired on main ++ final PlayerKickEvent event = MCUtil.ensureMain(() -> { ++ PlayerKickEvent playerKickEvent = new PlayerKickEvent(this.player.getBukkitEntity(), reason, leaveMessage, cause); // Paper - Adventure & kick event reason + + if (this.cserver.getServer().isRunning()) { +- this.cserver.getPluginManager().callEvent(event); ++ this.cserver.getPluginManager().callEvent(playerKickEvent); + } ++ return playerKickEvent; ++ }); ++ // Paper end + + if (event.isCancelled()) { + // Do not kick the player