mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b327e17 Fix regenerate chunk method PaperMC/Paper@22ac7d6 Add internal netty pipeline events PaperMC/Paper@345a6a6 Updated Upstream (CraftBukkit) PaperMC/Paper@86f87ba Fix custom merchant trade event world reference
This commit is contained in:
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 00fbf9ffdfa1c0d821ff86108c33e8b62a3d1268..295e3372d1e986549c96397c6ce26fb37e49f1ac 100644
|
||||
index a5d8dfc77475845be7c6d37eed04fb19eeef1c0c..0d428a9c6c8854a99f5f1a9860fe1a57c3fab392 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -2234,6 +2234,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||||
@@ -2235,6 +2235,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||||
public DragonBattle getEnderDragonBattle() {
|
||||
return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user