mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
Updated Upstream (Paper & Airplane)
Upstream has released updates that appear to apply and compile correctly Paper Changes:06db5d08b0Updated Upstream (Bukkit/CraftBukkit) (#6589)810d200bb4Improve interact distance check (#6591) Airplane Changes:8207533bdfUpstream
This commit is contained in:
@@ -17,10 +17,10 @@ index 0544ac93513d3a274bfb53bb6120bd598f4d603b..9ce5984fbeba4839290c9d213d441957
|
||||
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 535089a8f48d155883a105110f68056c5838ee83..0f19709d6fa4a2b14c472dfe54bebe0c617a93c0 100644
|
||||
index 05974b859ae1b1f56a739648c29693859b036a65..c4b60be92fec445096e81e9fad106d2a9f635ff2 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2687,4 +2687,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2683,4 +2683,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user