Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a8d7ad099 Updated Upstream (Bukkit/CraftBukkit) (#5735)
2299159bb Add option to fix items merging through blocks (#5334)
d8c20ddc7 Fix PlayerBucketEmptyEvent result itemstack (#5698)
ceb3762fb Add PufferFishStateChangeEvent (#5606)
cd4defec0 [CI-SKIP] Update version checker to use V2 downloads API (#5728)
b9f2a673d Limit item frame cursors on maps (#5730)
This commit is contained in:
BillyGalbreath
2021-05-27 22:43:08 -05:00
parent d99cc6e82d
commit ae6ca468f6
11 changed files with 40 additions and 59 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix SPIGOT-6278
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/EntityPiglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/EntityPiglin.java
index 17dde4532714378f7480f55991d94fc82e9a2b05..31de422d9ad5809653c0ce129ebc565d12352e65 100644
index 4f2c26ea34c82ec7c4f8ff92dd2e8a1f56a1afa6..42230ba14371ecb39c971f3a2969d1522c0fabc0 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/EntityPiglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/EntityPiglin.java
@@ -172,7 +172,7 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow {
@@ -200,7 +200,7 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow {
@Override
public boolean isTypeNotPersistent(double d0) {