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@8bc0574 Bump kyori's ansi to fix color bleed (#9346) PaperMC/Paper@f7b386d Use ANSI serializer for console completion descriptions (#9351) PaperMC/Paper@41e6f20 Updated Upstream (Bukkit/CraftBukkit) (#9342) PaperMC/Paper@b134eb4 Fix incorrect annotation on BrushableBlock#getItem (#9345) PaperMC/Paper@fa674f3 Don't enforce icanhasbukkit default if alias block exists (#9334) PaperMC/Paper@81834ac Updated Upstream (Bukkit/CraftBukkit/Spigot) PaperMC/Paper@f6139de Fix sniffer removeExploredLocation and javadoc (#9311) PaperMC/Paper@17966dd Update the server logo (#9264) PaperMC/Paper@02e3b5a chore(api): add missing javadoc urls (#9355) PaperMC/Paper@3f237e8 Fix IntegerUtil#getDivisorNumbers PaperMC/Paper@f555138 Make sure to post process chunks before they are sent to players PaperMC/Paper@a226f44 Copy itemstack when sanitizing for datawatcher items PaperMC/Paper@3885666 Remove stacktrace on exception from reading server.properties (#9296)
This commit is contained in:
@@ -17,10 +17,10 @@ index 818289e831e3dad29345c43265e2efd7689bc500..1ea3012995c738c67b31e997c138f824
|
||||
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 a487bdaa357e42cb00778505f3cf2283f5602b26..9f8300313465bef8f356961dde9d9cee870561c2 100644
|
||||
index 08fb70dc6bced3026b528590019577eb5a72197f..2d15e34720860d8f5d7922dfcad14ef3449a17ce 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -3009,4 +3009,11 @@ public final class CraftServer implements Server {
|
||||
@@ -3013,4 +3013,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user