mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper)
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:
@@ -17,10 +17,10 @@ index c9d80a5430cc66d6189bf337770af43121a5bfd5..329336d413317388455fbbf03036cee1
|
||||
public final boolean spawnNpcs = this.get("spawn-npcs", true);
|
||||
public final boolean pvp = this.get("pvp", true);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 84858994a92380d71ae9c456853ab3ea54afa98e..8809e738bd0baa6ba18d57df14d9b95624d90d14 100644
|
||||
index 6329a85dbed1de21dd7dcde8b62d51f09da47e78..b23d250c76236504e057f3a7e9e1d394a282812b 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2543,4 +2543,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2553,4 +2553,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user