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)

patches/server/0148-Add-MC-4-fix-back.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] Add MC-4 fix back
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 260a2d8616030c0f5619eb357719b980f93570c8..b7b00d28f60350958dd0e92b755237c1f15040ec 100644
+index ad691bd5c17ef7a8ecb394d620e02b28ac08f5a4..b106801e08d5a87eaaf115653cf57f58f45f5869 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4029,7 +4029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-     public final void setPosRaw(double x, double y, double z) {
+@@ -4034,7 +4034,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+         // Paper end
          // Paper start - fix MC-4
          if (this instanceof ItemEntity) {
 -            if (false && com.destroystokyo.paper.PaperConfig.fixEntityPositionDesync) { // Tuinity - revert