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: 6ecbe5776 Rename leftover resource->datapack (#5662) ec90a7859 I give up on trying to teach people to avoid the incorrect ways.
This commit is contained in:
@@ -17,7 +17,7 @@ index 1fab9b9c7d41a0d2a551096c2c15f741a887fa2d..f33309f4c1ad92960d0634f3f5b8105c
|
||||
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
|
||||
public final boolean pvp = this.getBoolean("pvp", true);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 9b4edf52d0e1883edad06be296512a9f7c6cdd29..f3e2a6ec37045fae48166682d6cabe513d581833 100644
|
||||
index 77b20b418d74af25116c4a0182a96b23dce35d13..e927ebb58e8dfc5333e3ea3ab74242bac9570593 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2541,4 +2541,11 @@ public final class CraftServer implements Server {
|
||||
|
||||
Reference in New Issue
Block a user