mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit) (#8015)

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:
05ae036c PR-746: Add option to use cached map color palette
57849c1b PR-759: Add preview chat option in ServerListPingEvent
0169e65d PR-758: Add missing server properties methods from 1.19

CraftBukkit Changes:
622dbe6c2 SPIGOT-7068: SKULK and SKULK_VEIN BlockSpreadEvents Still do not reference the correct source (SKULK_CATALYST)
6c61b73f3 PR-1052: Add option to use cached map color palette
c882f38ea SPIGOT-7066: Fix custom END worlds not generating DragonBattle
6866aab59 SPIGOT-2420: Can't set exp drops for EnderDragon death
9dcd46530 PR-1067: Add preview chat option in ServerListPingEvent
36c2681af PR-1066: Add missing server properties methods from 1.19
031eaadd0 Increase outdated build delay
8fda4b12f SPIGOT-7060: SCULK and SCULK_VEIN BlockSpreadEvents do not reference the correct source
This commit is contained in:
Nassim Jahnke 2022-06-20 19:12:05 +02:00 • committed by GitHub
parent ed9cf5ca08
commit fb2c24b36d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
99 changed files with 361 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/0372-Add-tick-times-API-and-mspt-command.patch
View file

@ -129,7 +129,7 @@ index 82bce89dc174c8c4a4ab8efeffaaf22ddeb377fb..37d28625b9528bbe0cd6d9623e702bbb
public static void registerCommands(final MinecraftServer server) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8de56cabd8fdc68e136d41c4d172f3574e21e57a..f69ed252f55623ee5cba6ac9d28096c2cc92ea04 100644
index f7427ea6bf11ef837dd38d25cd3abed57de5e8de..ce7b96819bf8d7e992c2aafd3013e8a9478e500d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -234,6 +234,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -189,10 +189,10 @@ index 8de56cabd8fdc68e136d41c4d172f3574e21e57a..f69ed252f55623ee5cba6ac9d28096c2
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0c2658c2cd411b6e5e5dcb9a190e7b223eeb0ffc..452f7de1b7c1e2b03c311a1a5f63a6d925b7543f 100644
index de114eda44d475c50f25f8dfedf17c41e783c5d9..9e2a90b2b5173667f336d64da111221d0093a7d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2449,6 +2449,16 @@ public final class CraftServer implements Server {
@@ -2471,6 +2471,16 @@ public final class CraftServer implements Server {
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
};
}