Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
871f30038 fixed kick event leave message (#4766)
0aa0a1d97 Updated Upstream (CraftBukkit)
d770f71f4 Add PlayerArmSwingEvent (#5353)
23d887b2a Swapped out Vec3#distanceTo call with a Vec3#distanceToSqr call to remove calls to Math.sqrt
5ff90b938 Fix collisions during world generation (#6129)
20ff0b058 [ci skip] Add a test plugin (#6133)
416ec9898 [ci skip] Remove extra newlines at EOF (#6127)
79d7dfbbe Ensure shulker bounding box is updated (#6010)
d8ad276b7 [ci skip] More badges and things to README.md (#5338)
bb44da842 Fix cancelling EntityPickupItemEvent for villagers (#6091)
351a2c38b Drop no longer needed patch (#6115)
648f6078d Route sign run_command click events through normal chat logic (#6109)
dafc06460 Fix MobEffectArgument#getEffect reobf
4aef0354d [ci skip] Use Java toolchain for run tasks (#6108)
144e5f7ac Add option for logging named entity deaths (#6107)
b5be382d0 Add methods to `ProtoWorld` for working with `BlockState`s (#5929)
This commit is contained in:
TwoLeggedCat
2021-07-09 16:56:56 -05:00
committed by Jason
parent 444413bba6
commit 325d6c39a4
15 changed files with 55 additions and 55 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b4d0df32fb9e8357ee87c779ff1228fb4f0009f5..d4f1984fcf965cb5b9bb9f2e10d790286d25c613 100644
index 5a23bc98f38e715ee16abe9a370b044e928b2d03..6db330cf388ef80f3acb84e41f02063c36f9aaf2 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4259,5 +4259,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -4264,5 +4264,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
public boolean processClick(InteractionHand hand) {
return false;
}