Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 deletions

View File

@@ -123,10 +123,10 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..19d6165f266fcc39bc3533042109ef1b
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5ded03b80f71111e8480036ae2787b419ac57133..6beb31d68b5d1fc84e396a510a68a488771fcac3 100644
index 04298bb935eacab6245afc0ae465ef0fab09101e..0f9758851ed05dd27496653cb0c00e6b0711a408 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3635,6 +3635,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -3650,6 +3650,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
return SlotAccess.NULL;
}