aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-API-Patches-Unmapped/0176-Flip-some-Spigot-API-null-annotations.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-API-Patches-Unmapped/0176-Flip-some-Spigot-API-null-annotations.patch')
-rw-r--r--Spigot-API-Patches-Unmapped/0176-Flip-some-Spigot-API-null-annotations.patch127
1 files changed, 127 insertions, 0 deletions
diff --git a/Spigot-API-Patches-Unmapped/0176-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches-Unmapped/0176-Flip-some-Spigot-API-null-annotations.patch
new file mode 100644
index 0000000000..36b534410a
--- /dev/null
+++ b/Spigot-API-Patches-Unmapped/0176-Flip-some-Spigot-API-null-annotations.patch
@@ -0,0 +1,127 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Sun, 24 Mar 2019 18:39:01 -0400
+Subject: [PATCH] Flip some Spigot API null annotations
+
+while some of these may of been true, they are extreme cases and cause
+a ton of noise to plugin developers.
+
+These do not help plugin developers if they bring moise noise than value.
+
+diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
+index 908b75f0b9897ce830ed7c0a2c1dd0a458a872f1..1f5bcda86990d7c336db21d9c927bbf6b1b6d74d 100644
+--- a/src/main/java/org/bukkit/Bukkit.java
++++ b/src/main/java/org/bukkit/Bukkit.java
+@@ -1377,7 +1377,7 @@ public final class Bukkit {
+ *
+ * @return the scoreboard manager or null if no worlds are loaded.
+ */
+- @Nullable
++ @NotNull // Paper
+ public static ScoreboardManager getScoreboardManager() {
+ return server.getScoreboardManager();
+ }
+@@ -1674,7 +1674,7 @@ public final class Bukkit {
+ * @param clazz the class of the tag entries
+ * @return the tag or null
+ */
+- @Nullable
++ @UndefinedNullability // Paper
+ public static <T extends Keyed> Tag<T> getTag(@NotNull String registry, @NotNull NamespacedKey tag, @NotNull Class<T> clazz) {
+ return server.getTag(registry, tag, clazz);
+ }
+diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
+index 9c91c49ed7302c12fcb1d8e9bc58712efc199954..d5d67b3d84cd88ed0f858497e68535ec0162c700 100644
+--- a/src/main/java/org/bukkit/Location.java
++++ b/src/main/java/org/bukkit/Location.java
+@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
+ * @param y The y-coordinate of this new location
+ * @param z The z-coordinate of this new location
+ */
+- public Location(@Nullable final World world, final double x, final double y, final double z) {
++ public Location(@UndefinedNullability final World world, final double x, final double y, final double z) { // Paper
+ this(world, x, y, z, 0, 0);
+ }
+
+@@ -60,7 +60,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
+ * @param yaw The absolute rotation on the x-plane, in degrees
+ * @param pitch The absolute rotation on the y-plane, in degrees
+ */
+- public Location(@Nullable final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
++ public Location(@UndefinedNullability final World world, final double x, final double y, final double z, final float yaw, final float pitch) {
+ if (world != null) {
+ this.world = new WeakReference<>(world);
+ }
+@@ -102,7 +102,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
+ * @throws IllegalArgumentException when world is unloaded
+ * @see #isWorldLoaded()
+ */
+- @Nullable
++ @UndefinedNullability
+ public World getWorld() {
+ if (this.world == null) {
+ return null;
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index a68b973e7574cae3ee7be7cfc51786589280408a..39188fcf95beff906c68a822f6aa5e19ad3ad08c 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1160,7 +1160,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+ *
+ * @return the scoreboard manager or null if no worlds are loaded.
+ */
+- @Nullable
++ @NotNull // Paper
+ ScoreboardManager getScoreboardManager();
+
+ /**
+@@ -1430,7 +1430,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+ * @param clazz the class of the tag entries
+ * @return the tag or null
+ */
+- @Nullable
++ @UndefinedNullability
+ <T extends Keyed> Tag<T> getTag(@NotNull String registry, @NotNull NamespacedKey tag, @NotNull Class<T> clazz);
+
+ /**
+diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
+index 3578f491a053154789ad696e93c70fdde74912e6..0654873eef22d1e35c7430f098ff9e8f00b870e3 100644
+--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
++++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
+@@ -3,6 +3,7 @@ package org.bukkit.inventory;
+ import org.bukkit.Color;
+ import org.bukkit.Material;
+ import org.bukkit.Server;
++import org.bukkit.UndefinedNullability;
+ import org.bukkit.inventory.meta.BookMeta;
+ import org.bukkit.inventory.meta.ItemMeta;
+ import org.bukkit.inventory.meta.SkullMeta;
+@@ -25,7 +26,7 @@ public interface ItemFactory {
+ * @return a new ItemMeta that could be applied to an item stack of the
+ * specified material
+ */
+- @Nullable
++ @UndefinedNullability // Paper
+ ItemMeta getItemMeta(@NotNull final Material material);
+
+ /**
+diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
+index ce9ee2d6d72069af518fc8d7d48a35c03b5f9f1f..3d63514729ddc30ff559a65815612be81e777892 100644
+--- a/src/main/java/org/bukkit/inventory/ItemStack.java
++++ b/src/main/java/org/bukkit/inventory/ItemStack.java
+@@ -8,6 +8,7 @@ import java.util.Set; // Paper
+ import org.apache.commons.lang.Validate;
+ import org.bukkit.Bukkit;
+ import org.bukkit.Material;
++import org.bukkit.UndefinedNullability;
+ import org.bukkit.Utility;
+ import org.bukkit.configuration.serialization.ConfigurationSerializable;
+ import org.bukkit.enchantments.Enchantment;
+@@ -546,7 +547,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
+ *
+ * @return a copy of the current ItemStack's ItemData
+ */
+- @Nullable
++ @UndefinedNullability // Paper
+ public ItemMeta getItemMeta() {
+ return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone();
+ }