Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

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

Paper Changes:
3aae7ef Updated Upstream (Bukkit/CraftBukkit)
4713937 Fix return value of Block#applyBoneMeal always being false (#6030)
This commit is contained in:
William Blake Galbreath
2021-06-28 22:07:35 -05:00
parent 76845665e6
commit cd5f184f6d
12 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -461,7 +461,7 @@ index 0000000000000000000000000000000000000000..6e7f56fe2b78d7a09d5d130f2c88338f
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c61ff190f04ac3d765d34f3eeb6a927d49f8d491..84858994a92380d71ae9c456853ab3ea54afa98e 100644
index 818dde63df240c7e72526ef0aef87c9f8739f78a..6329a85dbed1de21dd7dcde8b62d51f09da47e78 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -876,6 +876,7 @@ public final class CraftServer implements Server {
@@ -488,7 +488,7 @@ index c61ff190f04ac3d765d34f3eeb6a927d49f8d491..84858994a92380d71ae9c456853ab3ea
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2374,6 +2377,18 @@ public final class CraftServer implements Server {
@@ -2384,6 +2387,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report