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

@@ -36,10 +36,10 @@ index dcba69c0ad3288ddc64dacc58b6fb857eed3109c..57200e6b419ab0793df6498467325b6d
public void displayClientMessage(Component message, boolean actionBar) {
this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 2fd0a432ed52ca137622a1f631e886aaf77f33d3..a8a1affc747aee30c227d79f563facb8503d9c5e 100644
index 936ae5576902e6593bd21af4d3cf3998109347b5..6cb325b098fe64b746940ce79fd927320ec444e6 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1391,6 +1391,62 @@ public abstract class PlayerList {
@@ -1396,6 +1396,62 @@ public abstract class PlayerList {
}
// CraftBukkit end
@@ -103,7 +103,7 @@ index 2fd0a432ed52ca137622a1f631e886aaf77f33d3..a8a1affc747aee30c227d79f563facb8
this.server.sendMessage(message, sender);
Iterator iterator = this.players.iterator();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e75efd67acb063e3ce7506839e4a888241bda703..6800ba596ce3decfe268ccf897d7951a233e730d 100644
index d9265426ddb91a6cff634b8fcc3ed26072379f43..3d50e17f13a9c9678b8d912f874096fbd28a42ee 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3565,6 +3565,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n