mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a36d7f6 Updated Upstream (CraftBukkit) PaperMC/Paper@7b9c30f Fix scoreboard objective name length limit
This commit is contained in:
@@ -17,10 +17,10 @@ index ebfaa8d5de5b905bd2dd7778728b8c9939d01252..8153f1aa510474d2f831799a1c149558
|
||||
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 0b5a4e0d805558329fd95d8729690e05ee0db9b9..36776ee4e143b1198a88bf08fd4ba2d2116fe1d1 100644
|
||||
index ce07e8cd0a767a97850380c5e015108f0f1a238b..be20f1450f1b562e4b2112ee16a952313da3b009 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2853,4 +2853,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2873,4 +2873,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user