From 754948e5247afd2955521ab046757b9ec0aa029d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 24 Mar 2021 16:35:17 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 6caa330c6 Add checkerframework nullness annotations to accepted list for AnnotationTest (#5409) --- Paper | 2 +- ...41-Fix-paper-using-wrong-annotations.patch | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 patches/api/0041-Fix-paper-using-wrong-annotations.patch diff --git a/Paper b/Paper index 7259c32ba..6caa330c6 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 7259c32bacbad6e200eeb573e39c9d0b329f59c3 +Subproject commit 6caa330c6125a56f24b845db5791f5583519b61f diff --git a/patches/api/0041-Fix-paper-using-wrong-annotations.patch b/patches/api/0041-Fix-paper-using-wrong-annotations.patch deleted file mode 100644 index 697b75a89..000000000 --- a/patches/api/0041-Fix-paper-using-wrong-annotations.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: jmp -Date: Wed, 24 Mar 2021 03:28:32 -0500 -Subject: [PATCH] Fix paper using wrong annotations - - -diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 607eb670b5e6adc2a4dce81b6e56b219c8a4f95f..d3b2dd605c187d211b5c99056f286cbabba09224 100644 ---- a/src/main/java/org/bukkit/inventory/Inventory.java -+++ b/src/main/java/org/bukkit/inventory/Inventory.java -@@ -158,7 +158,7 @@ public interface Inventory extends Iterable { - * - * @return An array of ItemStacks from the inventory. Individual items may be null. - */ -- public @Nullable ItemStack @NotNull [] getContents(); // Paper - make array elements nullable instead array -+ public @org.checkerframework.checker.nullness.qual.Nullable ItemStack @org.checkerframework.checker.nullness.qual.NonNull [] getContents(); // Paper - make array elements nullable instead array // Purpur - - /** - * Completely replaces the inventory's contents. Removes all existing