Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ea30a299 Add docs in ServerListPingEvent based on changes from 1.18 CraftBukkit Changes: 03f249f0 Generate bootstrap jar separately 3b214b5a SPIGOT-6803: Fix ServerPing not using the new logic for show players in 1.18 Spigot Changes: c07753b0 Rebuild patches
This commit is contained in:
parent
66dbf41a65
commit
3cd2c987cf
7 changed files with 13 additions and 13 deletions
|
@ -179,7 +179,7 @@ index 0000000000000000000000000000000000000000..273746fe476a9a09ebca01c6ecd814b7
|
|||
+}
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
deleted file mode 100644
|
||||
index 46c1c0461ab4ddfe652fc260b7647bdfc704f36f..0000000000000000000000000000000000000000
|
||||
index 3610b0d8e10f873b8480864d6f73c20ae8c5d1f1..0000000000000000000000000000000000000000
|
||||
--- a/pom.xml
|
||||
+++ /dev/null
|
||||
@@ -1,539 +0,0 @@
|
||||
|
@ -568,7 +568,6 @@ index 46c1c0461ab4ddfe652fc260b7647bdfc704f36f..00000000000000000000000000000000
|
|||
- <goal>single</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <appendAssemblyId>false</appendAssemblyId>
|
||||
- <archive>
|
||||
- <manifest>
|
||||
- <addDefaultEntries>false</addDefaultEntries>
|
||||
|
@ -577,6 +576,7 @@ index 46c1c0461ab4ddfe652fc260b7647bdfc704f36f..00000000000000000000000000000000
|
|||
- <Main-Class>org.bukkit.craftbukkit.bootstrap.Main</Main-Class>
|
||||
- </manifestEntries>
|
||||
- </archive>
|
||||
- <attach>false</attach>
|
||||
- <descriptors>
|
||||
- <descriptor>${project.basedir}/src/assembly/bootstrap.xml</descriptor>
|
||||
- </descriptors>
|
||||
|
|
|
@ -213,7 +213,7 @@ index 543acb52698deb890a2624112e63be275a52c008..e9333b85100d7670b2be7df6e847dfca
|
|||
|
||||
for (int k = 0; k < agameprofile.length; ++k) {
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
|
||||
index dff7b1005f60c762ed81de5eb77e1575f07f5ce9..4edbdc7379714609053606b492942cfc768245e1 100644
|
||||
index 2b24a41587fbe1fba70a0ab42d3dc33358f2ba2e..4fa79d37ff4e70c61672cce7c55257c46232c026 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerStatusPacketListenerImpl.java
|
||||
@@ -47,6 +47,8 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
|
||||
|
@ -223,9 +223,9 @@ index dff7b1005f60c762ed81de5eb77e1575f07f5ce9..4edbdc7379714609053606b492942cfc
|
|||
+ // Paper start - Replace everything
|
||||
+ /*
|
||||
// CraftBukkit start
|
||||
// this.networkManager.sendPacket(new PacketStatusOutServerInfo(this.minecraftServer.getServerPing()));
|
||||
// this.connection.send(new PacketStatusOutServerInfo(this.server.getStatus()));
|
||||
final Object[] players = this.server.getPlayerList().players.toArray();
|
||||
@@ -143,6 +145,9 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
|
||||
@@ -150,6 +152,9 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
|
||||
|
||||
this.connection.send(new ClientboundStatusResponsePacket(ping));
|
||||
// CraftBukkit end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue