Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper) (#787)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c1bd3cc Updated Upstream (CraftBukkit) (#7105)
PaperMC/Paper@df1301b Make org.bukkit.Keyed extend Adventure's Keyed (#7090)
PaperMC/Paper@d8747c1 [ci skip] Add nullable annotation to field (#7042)
PaperMC/Paper@7f31095 Add more Campfire API (#5779)
PaperMC/Paper@51d1687 Update log4j to 2.16.0
This commit is contained in:
Oharass
2021-12-14 13:59:40 -06:00
committed by GitHub
parent 45ae426761
commit b8261d92e6
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0003-Purpur-config-files.patch
View File

@@ -106,7 +106,7 @@ index 4247dcb003626535dbb997f48ad9f61380bd17e9..03a4c5fa746033825c26a031fbf79f72
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 310c3e1590465412af6905eab33193c6bf5e5e47..549577e31840ce5f32adb2c0909b915da4362207 100644
index 2c31a0c1e76c92aa3ca8aa97a30d79675dea7e85..5566c149b6c44a13ea65ab8ccb61055afbb2e277 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -931,6 +931,7 @@ public final class CraftServer implements Server {
@@ -133,7 +133,7 @@ index 310c3e1590465412af6905eab33193c6bf5e5e47..549577e31840ce5f32adb2c0909b915d
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2648,6 +2651,18 @@ public final class CraftServer implements Server {
@@ -2641,6 +2644,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}