mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 01:17:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e6f8284 Updated Upstream (Bukkit/CraftBukkit) (#8270)
This commit is contained in:
@@ -17,10 +17,10 @@ index a32cfa75a9bea896f558bab646d0868391b069a9..01ca7156d86243a80cd343a2a66be9eb
|
||||
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 6fca71fa3cb8c8ff53fe85966f251efecf9b4f6b..c9f1b0b48300d0ea24c62eb83198a4cd54d6cd02 100644
|
||||
index c1a8ac2abf79075f4ea70d2cfe1fc577e0e92271..0f441589561bff0d2f21bf1a1d764422a34ecbee 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2919,4 +2919,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2926,4 +2926,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user