mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
22 lines
1.6 KiB
Diff
22 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
||
|
|
Date: Thu, 30 May 2024 18:46:15 +0100
|
||
|
|
Subject: [PATCH] Fix sending disconnect packet in phases where it doesn't
|
||
|
|
exist
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java
|
||
|
|
index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..f40420a6841f03983b0837e177ea2ae7c3a37ca1 100644
|
||
|
|
--- a/src/main/java/net/minecraft/network/Connection.java
|
||
|
|
+++ b/src/main/java/net/minecraft/network/Connection.java
|
||
|
|
@@ -214,7 +214,8 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
|
||
|
|
if (player != null) player.quitReason = org.bukkit.event.player.PlayerQuitEvent.QuitReason.ERRONEOUS_STATE; // Paper - Add API for quit reason
|
||
|
|
if (flag) {
|
||
|
|
Connection.LOGGER.debug("Failed to sent packet", throwable);
|
||
|
|
- if (this.getSending() == PacketFlow.CLIENTBOUND) {
|
||
|
|
+ boolean doesDisconnectExist = this.packetListener.protocol() != ConnectionProtocol.STATUS && this.packetListener.protocol() != ConnectionProtocol.HANDSHAKING; // Paper
|
||
|
|
+ if (this.getSending() == PacketFlow.CLIENTBOUND && doesDisconnectExist) { // Paper
|
||
|
|
Packet<?> packet = this.sendLoginDisconnect ? new ClientboundLoginDisconnectPacket(ichatmutablecomponent) : new ClientboundDisconnectPacket(ichatmutablecomponent);
|
||
|
|
|
||
|
|
this.send((Packet) packet, PacketSendListener.thenRun(() -> {
|