Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
088fa6f28 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)
bd7c1d88b Merchant#getRecipes should return an immutable list (#5183)
This commit is contained in:
BillyGalbreath
2021-02-13 11:42:45 -06:00
parent 006e47f147
commit 9ae031c6f0
15 changed files with 21 additions and 37 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 905e3a98fe900c82053b1514122bfe6cf1000dfa..e59826b3e822a49378ae0d7b7cbca8c5d5ff476d 100644
index d888dbb2f6c20eee98c0c8b0d1c62ba30615e8eb..b3b654da3c5a036871248b0a7c8e6ca77b44345d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3448,8 +3448,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke