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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable dolphin treasure searching
diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
index da30c9b0f49e714ff7c84c32f62ffeacaedb6aff..3b198ad456f666fa1819ac39bcdfc8c85a256708 100644
index af2a46699fc2520a796a68f77c12ff6479d87e31..9ad944839ec143375414fc3e054a2f8cc16814cd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
@@ -482,6 +482,7 @@ public class Dolphin extends WaterAnimal {
@@ -488,6 +488,7 @@ public class Dolphin extends WaterAnimal {
@Override
public boolean canUse() {