OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
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:
Josh Roy 2021-11-23 16:11:33 -05:00
parent ddaf1cb4e2
commit cd161c51c5
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/server/Implement-extended-PaperServerListPingEvent.patch
View file

@ -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

2
patches/server/Setup-Gradle-project.patch
View file

@ -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>

2
work/BuildData

@ -1 +1 @@
Subproject commit b364c062bb9b9534c0dd34c7a46f3f1acbfb195d
Subproject commit 8581e449a3490934f8bfa8b36d45842393dc8a20

2
work/Bukkit

@ -1 +1 @@
Subproject commit 07a055315ce10d9e6134b9367443ddeeda501236
Subproject commit ea30a299e948f5545b0ad042bd8e11716aeaa7f2

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit dd02403be2ea957207939f1eec83cd2753d95bbc
Subproject commit 03f249f09854e409a231d5e2024cef635d652b79

2
work/Spigot

@ -1 +1 @@
Subproject commit d5de734690f9745e2c8968cf5369664ff0f53af9
Subproject commit c07753b057d92ef6c0f9ad8e8446f51bcc37604d