Skip to content

Commit 873bfa6

Browse files
authored
Remove World#refreshChunk deprecation (#7684)
1 parent 4ecc338 commit 873bfa6

4 files changed

+21
-6
lines changed

patches/api/0175-Fix-Spigot-annotation-mistakes.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,21 @@ index 71b32c1ca960a58ae9757e470626fa3e16d3c28b..f673927df360702b07f1fd197a3de07b
9191
+ @NotNull // Paper
9292
ScoreboardManager getScoreboardManager();
9393

94+
/**
95+
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
96+
index f36eb8896ee84c1d3bbce17b11ed05c5f99f2e29..b8c4d25d49ea65d36b052faba8863efa813d9bc5 100644
97+
--- a/src/main/java/org/bukkit/World.java
98+
+++ b/src/main/java/org/bukkit/World.java
99+
@@ -427,9 +427,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
100+
* @param z Z-coordinate of the chunk
101+
* @return Whether the chunk was actually refreshed
102+
*
103+
- * @deprecated This method is not guaranteed to work suitably across all client implementations.
104+
*/
105+
- @Deprecated
106+
+ //@Deprecated // Paper
107+
public boolean refreshChunk(int x, int z);
108+
94109
/**
95110
diff --git a/src/main/java/org/bukkit/entity/LingeringPotion.java b/src/main/java/org/bukkit/entity/LingeringPotion.java
96111
index f124b35ec76e6cb6a1a0dc464005087043c3efd0..94a2fef0dc9e13c754cd31d5eabc1bde2dbbe6a5 100644

patches/api/0276-Implement-Keyed-on-World.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ index f8226ce49584a9086208037f2c8fe369ae7bfbf0..b0cfe2e72d404aca204a0a1a43e4ba4e
5050
* Create a new virtual {@link WorldBorder}.
5151
* <p>
5252
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
53-
index 513de620accbee93a04ef729dd386dadba566a8f..caa674ed1e4b3a940cee05a79d1af47b20e3badb 100644
53+
index eed79cbb4e8955755bc3969ff70a728f275b4af9..3c74768ebf6690056576e8fceb7f2e2ee2a70492 100644
5454
--- a/src/main/java/org/bukkit/World.java
5555
+++ b/src/main/java/org/bukkit/World.java
5656
@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
@@ -62,7 +62,7 @@ index 513de620accbee93a04ef729dd386dadba566a8f..caa674ed1e4b3a940cee05a79d1af47b
6262

6363
// Paper start
6464
/**
65-
@@ -1529,6 +1529,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
65+
@@ -1528,6 +1528,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
6666

6767
@NotNull
6868
java.util.concurrent.CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent);

patches/api/0284-More-World-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] More World API
55

66

77
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8-
index caa674ed1e4b3a940cee05a79d1af47b20e3badb..a1922fd862872442ec9dd07b6c24b0d764b11b71 100644
8+
index 3c74768ebf6690056576e8fceb7f2e2ee2a70492..9161b01781aab56611937d021a0cca0736ce782c 100644
99
--- a/src/main/java/org/bukkit/World.java
1010
+++ b/src/main/java/org/bukkit/World.java
11-
@@ -3647,6 +3647,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11+
@@ -3646,6 +3646,114 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1212
@Nullable
1313
public Location locateNearestStructure(@NotNull Location origin, @NotNull StructureType structureType, int radius, boolean findUnexplored);
1414

patches/api/0330-Add-methods-to-find-targets-for-lightning-strikes.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
55

66

77
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
8-
index 2173d1e675bdb90f3117614e6e52dac61b4fada9..887ad76c3ea44f0dcfcd21f30c0883e023f1ac3a 100644
8+
index 4b4b286e9373da2624a29e17df7e54f5e47c3f7d..2007e09322624184ea35186a9b1c2ee80294a38f 100644
99
--- a/src/main/java/org/bukkit/World.java
1010
+++ b/src/main/java/org/bukkit/World.java
11-
@@ -761,6 +761,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11+
@@ -760,6 +760,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1212
@NotNull
1313
public LightningStrike strikeLightningEffect(@NotNull Location loc);
1414

0 commit comments

Comments
 (0)