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

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092)

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:
d41796de SPIGOT-7071: Add Player#stopSound(SoundCategory category)
61dae5b2 SPIGOT-7011, SPIGOT-7065: Overhaul of structures

CraftBukkit Changes:
991aeda12 SPIGOT-1729, SPIGOT-7090: Keep precision in teleportation between worlds
5c9a5f628 SPIGOT-7071: Add Player#stopSound(SoundCategory category)
68f888ded SPIGOT-7011, SPIGOT-7065: Overhaul of structures
0231a3746 Remove outdated build delay.

Spigot Changes:
475f6008 Rebuild patches
8ce1761f Rebuild patches
This commit is contained in:
Nassim Jahnke 2022-07-04 16:38:06 +02:00 • committed by GitHub
parent 1e5d1db2b7
commit 385f313a8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
271 changed files with 640 additions and 748 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/server/0642-Add-basic-Datapack-API.patch
View file

@ -92,10 +92,10 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 280edb675f19be2b88c2b8075c3d865726ce9f7f..68f46b7ade51b896b4044df3b737dd0e08a2b991 100644
index 34b365ce84439958eeba04fa50a13e02ddbd9412..b38265b4077f37aaab2701663f6740dd8fd729b4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -278,6 +278,7 @@ public final class CraftServer implements Server {
@@ -280,6 +280,7 @@ public final class CraftServer implements Server {
public boolean ignoreVanillaPermissions = false;
private final List<CraftPlayer> playerView;
public int reloadCount;
@ -103,7 +103,7 @@ index 280edb675f19be2b88c2b8075c3d865726ce9f7f..68f46b7ade51b896b4044df3b737dd0e
public static Exception excessiveVelEx; // Paper - Velocity warnings
static {
@@ -364,6 +365,7 @@ public final class CraftServer implements Server {
@@ -366,6 +367,7 @@ public final class CraftServer implements Server {
if (this.configuration.getBoolean("settings.use-map-color-cache")) {
MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
}
@ -111,7 +111,7 @@ index 280edb675f19be2b88c2b8075c3d865726ce9f7f..68f46b7ade51b896b4044df3b737dd0e
}
public boolean getCommandBlockOverride(String command) {
@@ -2756,5 +2758,11 @@ public final class CraftServer implements Server {
@@ -2763,5 +2765,11 @@ public final class CraftServer implements Server {
public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
return mobGoals;
}