Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6caa330c6 Add checkerframework nullness annotations to accepted list for AnnotationTest (#5409)
This commit is contained in:
BillyGalbreath
2021-03-24 16:35:17 -05:00
parent f55c0e92da
commit 754948e524
2 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 7259c32bac...6caa330c61

19
patches/api/0041-Fix-paper-using-wrong-annotations.patch
View File

@@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: jmp <jasonpenilla2@me.com>
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<ItemStack> {
*
* @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