From c544757d8cdcd6cf42f0a7b1a183f906ce1c8a4d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 12 Jan 2025 15:42:34 -0800 Subject: [PATCH] Add local difficulty api --- .../files/src/main/java/org/bukkit/World.java.patch | 10 +--------- .../java/org/bukkit/craftbukkit/CraftWorld.java.patch | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) rename patches/api/0034-Add-local-difficulty-api.patch => purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch (51%) rename patches/server/0247-Add-local-difficulty-api.patch => purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch (57%) diff --git a/patches/api/0034-Add-local-difficulty-api.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch similarity index 51% rename from patches/api/0034-Add-local-difficulty-api.patch rename to purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch index bb9a78b78..a508443d8 100644 --- a/patches/api/0034-Add-local-difficulty-api.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Sat, 9 Jul 2022 00:57:26 -0500 -Subject: [PATCH] Add local difficulty api - - -diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index bef54a6c8290e09cbaac20b03dde8dfb902c96b0..3d1e2a6804980c091fe2a66a6810564d317d339f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4246,6 +4246,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -4246,6 +_,16 @@ @Nullable public DragonBattle getEnderDragonBattle(); diff --git a/patches/server/0247-Add-local-difficulty-api.patch b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch similarity index 57% rename from patches/server/0247-Add-local-difficulty-api.patch rename to purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch index c84434e1e..f73b1ff98 100644 --- a/patches/server/0247-Add-local-difficulty-api.patch +++ b/purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch @@ -1,14 +1,6 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Sat, 9 Jul 2022 00:57:32 -0500 -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 92d9f0ea8f7810ae20d3996f49aefa539b4bcb69..f1e85d6c745397fe012f1ae0fd6f64353eac65a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2374,6 +2374,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2346,6 +_,12 @@ return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight()); }