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@6520ca1 Fix main thread priority being lowered (#9488) PaperMC/Paper@47b805f Don't let player loot if reloot time is disabled (#9615) PaperMC/Paper@73af2d4 Add clicked position to PlayerUseUnknownEntityEvent (#9604) PaperMC/Paper@ea1f33c Delete patch to fix PaperMC/Paper#9612 (#9621) PaperMC/Paper@307d05b Count down radius-aware dependency tree node parents (#9600) PaperMC/Paper@eb8f2bb Fix unknown entity interaction clicked position getter if null PaperMC/Paper@fd4f0c7 API for an entity's scoreboard name (#9462) PaperMC/Paper@2bd6ba2 Deprecate and replace methods using deprecated StructureType (#8643) PaperMC/Paper@666a214 [ci skip] rebuild patches
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 f0eaab7c4a4ee995324f07ef4fb6c039847c8243..67cdaf81d4417ff0ef3331d7bf436737d3531eb6 100644
|
||||
index a78cf70e754ec35366fc269cca8e2deda14635b0..5acff437226157b851ad4231d0a6e7344da8a1ea 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -3135,4 +3135,11 @@ public final class CraftServer implements Server {
|
||||
@@ -3165,4 +3165,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
Reference in New Issue
Block a user