2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-03-25 00:13:07 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
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
|
2020-06-26 18:20:03 +02:00
|
|
|
index e372ca2339bc25d6110bf95e159703630acca215..12603c91046abf1ab58e8b797904b2cdafa7c9af 100644
|
2019-03-25 00:13:07 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
2020-06-26 18:20:03 +02:00
|
|
|
@@ -1243,7 +1243,7 @@ public final class Bukkit {
|
2019-03-25 00:13:07 +01:00
|
|
|
*
|
|
|
|
* @return the scoreboard manager or null if no worlds are loaded.
|
|
|
|
*/
|
|
|
|
- @Nullable
|
|
|
|
+ @NotNull // Paper
|
|
|
|
public static ScoreboardManager getScoreboardManager() {
|
|
|
|
return server.getScoreboardManager();
|
|
|
|
}
|
2020-06-26 18:20:03 +02:00
|
|
|
@@ -1540,7 +1540,7 @@ public final class Bukkit {
|
2019-03-25 00:13:07 +01:00
|
|
|
* @param clazz the class of the tag entries
|
|
|
|
* @return the tag or null
|
|
|
|
*/
|
|
|
|
- @Nullable
|
2019-03-25 00:33:26 +01:00
|
|
|
+ @UndefinedNullability // Paper
|
2019-03-25 00:13:07 +01:00
|
|
|
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
|
2020-05-06 11:48:49 +02:00
|
|
|
index 6e1a1124a6e528c1a94ccb1d09bc5dccf056b0b8..77d9cd0a1f54b5eb233eddbcff1bfa76bc182e9a 100644
|
2019-03-25 00:13:07 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Location.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Location.java
|
2019-05-06 04:58:04 +02:00
|
|
|
@@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
2019-03-25 00:13:07 +01:00
|
|
|
* @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) {
|
2019-03-25 00:33:26 +01:00
|
|
|
+ public Location(@UndefinedNullability final World world, final double x, final double y, final double z) { // Paper
|
2019-03-25 00:13:07 +01:00
|
|
|
this(world, x, y, z, 0, 0);
|
|
|
|
}
|
|
|
|
|
2019-05-06 04:58:04 +02:00
|
|
|
@@ -60,7 +60,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
2019-03-25 00:13:07 +01:00
|
|
|
* @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) {
|
2019-05-06 04:58:04 +02:00
|
|
|
+ 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()
|
2019-03-25 00:13:07 +01:00
|
|
|
*/
|
|
|
|
- @Nullable
|
2019-03-25 00:33:26 +01:00
|
|
|
+ @UndefinedNullability
|
2019-03-25 00:13:07 +01:00
|
|
|
public World getWorld() {
|
2019-05-06 04:58:04 +02:00
|
|
|
if (this.world == null) {
|
|
|
|
return null;
|
2019-03-25 00:13:07 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
2020-06-26 18:20:03 +02:00
|
|
|
index 8bbb2efe835b575733b560fe5e2b824e1a859d09..b46644bc97122814f80a44e6ff0b848f4cf132b7 100644
|
2019-03-25 00:13:07 +01:00
|
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
2020-06-26 18:20:03 +02:00
|
|
|
@@ -1042,7 +1042,7 @@ public interface Server extends PluginMessageRecipient {
|
2019-03-25 00:13:07 +01:00
|
|
|
*
|
|
|
|
* @return the scoreboard manager or null if no worlds are loaded.
|
|
|
|
*/
|
|
|
|
- @Nullable
|
|
|
|
+ @NotNull // Paper
|
|
|
|
ScoreboardManager getScoreboardManager();
|
|
|
|
|
|
|
|
/**
|
2020-06-26 18:20:03 +02:00
|
|
|
@@ -1312,7 +1312,7 @@ public interface Server extends PluginMessageRecipient {
|
2019-03-25 00:13:07 +01:00
|
|
|
* @param clazz the class of the tag entries
|
|
|
|
* @return the tag or null
|
|
|
|
*/
|
|
|
|
- @Nullable
|
2019-03-25 00:33:26 +01:00
|
|
|
+ @UndefinedNullability
|
2019-03-25 00:13:07 +01:00
|
|
|
<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
|
2020-05-06 11:48:49 +02:00
|
|
|
index 3cada34873e6da92363c8d920f3bbbd0670a32e0..03ba2265908d35bded0f38ed31187e5500e1b1f0 100644
|
2019-03-25 00:13:07 +01:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
2019-03-25 00:33:26 +01:00
|
|
|
@@ -3,6 +3,7 @@ package org.bukkit.inventory;
|
|
|
|
import org.bukkit.Color;
|
|
|
|
import org.bukkit.Material;
|
|
|
|
import org.bukkit.Server;
|
|
|
|
+import org.bukkit.UndefinedNullability;
|
2019-03-25 00:13:07 +01:00
|
|
|
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
|
2019-03-25 00:33:26 +01:00
|
|
|
+ @UndefinedNullability // Paper
|
2019-03-25 00:13:07 +01:00
|
|
|
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
|
2020-05-06 11:48:49 +02:00
|
|
|
index 4940ba6a979cec5bea0edc24b94149298c256bc3..d7d6a3e83dfd88359708749f5c12be02815c3580 100644
|
2019-03-25 00:13:07 +01:00
|
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
2019-04-23 06:47:07 +02:00
|
|
|
@@ -8,6 +8,7 @@ import java.util.Set; // Paper
|
2019-03-25 00:33:26 +01:00
|
|
|
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;
|
2020-01-22 04:06:28 +01:00
|
|
|
@@ -546,7 +547,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
2019-03-25 00:13:07 +01:00
|
|
|
*
|
|
|
|
* @return a copy of the current ItemStack's ItemData
|
|
|
|
*/
|
|
|
|
- @Nullable
|
2019-03-25 00:33:26 +01:00
|
|
|
+ @UndefinedNullability // Paper
|
2019-03-25 00:13:07 +01:00
|
|
|
public ItemMeta getItemMeta() {
|
|
|
|
return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone();
|
|
|
|
}
|