Skip to content

Commit 04c7b16

Browse files
Undeprecate Material#isLegacy (#7679)
1 parent 7bf9446 commit 04c7b16

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ a ton of noise to plugin developers.
99
These do not help plugin developers if they bring moise noise than value.
1010

1111
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
12-
index 686235a2347ebeaa5654a14cdd717009f2c0105f..cf7f8a8f03adcbe466b59ea8b98b527fb54a0803 100644
12+
index 52f5750e1cbce6000c72f5f1b4bde41b9fa66b23..19771a9a7a212a71f4cad33981c3b72341d80093 100644
1313
--- a/src/main/java/org/bukkit/Bukkit.java
1414
+++ b/src/main/java/org/bukkit/Bukkit.java
1515
@@ -1684,7 +1684,7 @@ public final class Bukkit {
@@ -31,7 +31,7 @@ index 686235a2347ebeaa5654a14cdd717009f2c0105f..cf7f8a8f03adcbe466b59ea8b98b527f
3131
return server.getTag(registry, tag, clazz);
3232
}
3333
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
34-
index 88b3e0323dbc4f0fce31b147c7aaa08d65745852..23ca89dde7f6ac9082d4b97fce2959425f3680cb 100644
34+
index 57cb548683f7b2972c998afd34176952426f8b47..d4c87bfed81b2d73919705912f59fab05c0ee61b 100644
3535
--- a/src/main/java/org/bukkit/Location.java
3636
+++ b/src/main/java/org/bukkit/Location.java
3737
@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -61,8 +61,26 @@ index 88b3e0323dbc4f0fce31b147c7aaa08d65745852..23ca89dde7f6ac9082d4b97fce295942
6161
public World getWorld() {
6262
if (this.world == null) {
6363
return null;
64+
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
65+
index 53d1609e2a75c007cb7e5e8f963b0deb53bae5f7..a8561434d56f7db7e4f52283759b282e9c2116a2 100644
66+
--- a/src/main/java/org/bukkit/Material.java
67+
+++ b/src/main/java/org/bukkit/Material.java
68+
@@ -4003,11 +4003,11 @@ public enum Material implements Keyed {
69+
}
70+
71+
/**
72+
- * Do not use for any reason.
73+
+ * Checks if this constant is a legacy material.
74+
*
75+
* @return legacy status
76+
*/
77+
- @Deprecated
78+
+ // @Deprecated // Paper - this is useful, don't deprecate
79+
public boolean isLegacy() {
80+
return legacy;
81+
}
6482
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
65-
index f43720d07e80e3d2937f5b271664b5268d7af027..4cd7dae2e6f530a402de460f61d57a27f5763b73 100644
83+
index ef10f62a00f19b6a2ca61c3984465f5cd9fa7479..790c09d8fc67dfe6325faff419be7d980415bad8 100644
6684
--- a/src/main/java/org/bukkit/Server.java
6785
+++ b/src/main/java/org/bukkit/Server.java
6886
@@ -1429,7 +1429,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

0 commit comments

Comments
 (0)