mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-26 09:42:06 -07:00
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:
@@ -223,7 +223,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
+ // 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();
|
||||
@@ -0,0 +0,0 @@ public class ServerStatusPacketListenerImpl implements ServerStatusPacketListene
|
||||
|
||||
|
@@ -568,7 +568,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||
- <goal>single</goal>
|
||||
- </goals>
|
||||
- <configuration>
|
||||
- <appendAssemblyId>false</appendAssemblyId>
|
||||
- <archive>
|
||||
- <manifest>
|
||||
- <addDefaultEntries>false</addDefaultEntries>
|
||||
@@ -577,6 +576,7 @@ index 0000000000000000000000000000000000000000..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>
|
||||
|
Submodule work/BuildData updated: b364c062bb...8581e449a3
Submodule work/Bukkit updated: 07a055315c...ea30a299e9
Submodule work/CraftBukkit updated: dd02403be2...03f249f098
Submodule work/Spigot updated: d5de734690...c07753b057
Reference in New Issue
Block a user