mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
ce403193df
Upstream has released updates that appears to apply and compile correctly Paper Changes: ab347c4c9 Updated Upstream (Bukkit/CraftBukkit/Spigot) e2e09326d [Auto] Updated Upstream (Bukkit/CraftBukkit) 778d63b19 Add Gradle usage information to README (#3700) 25c14f76f Fix compile 78c855237 Updated Upstream (CraftBukkit) 8a4af269b fix EntityDismountEvent being fired on gen threads 55fb7da78 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 d70195264 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 443fb80bf Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 d75c939e5 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 1431b1d6c Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 e4f2ec002 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 122475aee Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 b98da027d Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 a8ffecc74 Fix NPE and uuid lookup for player skulls
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
From 25d12fdb337d2ee04701ad2142690107368c728f Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
Date: Tue, 4 Jun 2019 15:50:08 -0500
|
|
Subject: [PATCH] Fix 'outdated server' showing in ping before server fully
|
|
boots
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/PacketStatusListener.java | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
|
|
index ee18dc3fa2..4532406c4e 100644
|
|
--- a/src/main/java/net/minecraft/server/PacketStatusListener.java
|
|
+++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
|
|
@@ -133,6 +133,7 @@ public class PacketStatusListener implements PacketStatusInListener {
|
|
|
|
this.networkManager.sendPacket(new PacketStatusOutServerInfo(ping));
|
|
*/
|
|
+ if (this.minecraftServer.getServerPing().getServerData() == null) return; // Purpur - do not respond to pings before we know the protocol version
|
|
com.destroystokyo.paper.network.StandardPaperServerListPingEventImpl.processRequest(this.minecraftServer, this.networkManager);
|
|
// Paper end
|
|
}
|
|
--
|
|
2.26.2
|
|
|