patch: fix recalculated hits attacking invalid entities

Fixes players being kicked for 'attacking an invalid entity'

Author: roccodev

Spigot-Server-Patches/0235-Extend-hit-recalculation-to-intangible-entities.patch

@@ -1,11 +1,11 @@
-From b89daad06bf8ec8773b2fd4a9ec0c26e51858c23 Mon Sep 17 00:00:00 2001
+From 3ca21945c5261cd73374a049b511cdd32211ddd5 Mon Sep 17 00:00:00 2001
 From: RoccoDev <[email protected]>
 Date: Tue, 4 Oct 2022 21:58:58 +0200
 Subject: [PATCH] Extend hit recalculation to intangible entities
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1aa0d226..b6c35462 100644
+index 1aa0d226c..ae2307612 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1,5 +1,6 @@
@@ -15,15 +15,15 @@ index 1aa0d226..b6c35462 100644
  import com.google.common.collect.Lists;
  import com.google.common.primitives.Doubles;
  import com.google.common.primitives.Floats;
-@@ -1344,39 +1345,36 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -1344,39 +1345,39 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
 
          this.player.resetIdleTimer();
          if (entity != null) {
 -            // KigPaper start - allow hitting the vehicle when hitboxes collide / allow the player to hit others if they are being ridden by something
-+            // KigPaper start - recalculate hit when hitboxes collide
 -            if(PaperSpigotConfig.betterVehicleHitboxes) {
-+            if (PaperSpigotConfig.betterVehicleHitboxes && packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK) {
 -                if (entity instanceof EntityPlayer && entity.vehicle != null && !((EntityPlayer) entity).collidesWithEntities) {
++            // KigPaper start - recalculate hit when hitboxes collide
++            if (PaperSpigotConfig.betterVehicleHitboxes && packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK) {
 +                Predicate<? super Entity> recalcHitPredicate = null;
 +                if (entity == player.passenger) {
 +                    // Player hit own passenger. This shouldn't be possible, so it's likely that the hit was meant
@@ -65,6 +65,9 @@ index 1aa0d226..b6c35462 100644
 +                            player.locZ);
                      Vec3D maxDistLook = eyePos.add(look.a * maxDist, look.b * maxDist, look.c * maxDist);
 -                    Entity passenger = entity.passenger;
++                    Predicate<? super Entity> finalRecalcHitPredicate = recalcHitPredicate;
++                    recalcHitPredicate = e -> finalRecalcHitPredicate.apply(e) && !(e instanceof EntityItem)
++                            && !(e instanceof EntityExperienceOrb) && !(e instanceof EntityArrow) && e != player;
                      List<Entity> collisions = worldserver.a(player, player.getBoundingBox()
                              .a(look.a * maxDist, look.b * maxDist, look.c * maxDist) // add coords
 -                            .grow(1D, 1D, 1D), e -> e != passenger); // Don't include passenger
@@ -77,5 +80,5 @@ index 1aa0d226..b6c35462 100644
                              entity = match;
                              break;
 -- 
-2.37.2
+2.51.0
 

Spigot-Server-Patches/0243-Disable-kick-for-tab-complete-packet-spam.patch

@@ -1,12 +1,12 @@
-From 9219bd632cfcff6d269a083a00bb20c3f7838c1e Mon Sep 17 00:00:00 2001
+From 21577a5f6e98991a9925549a2a8084a3efaaedca Mon Sep 17 00:00:00 2001
 From: RoccoDev <[email protected]>
 Date: Sun, 14 Jul 2024 23:18:21 +0200
 Subject: [PATCH] Disable kick for tab complete packet spam
 
 Newer versions send tab complete packets while typing the command/arguments. This also separates the chat/command and tab-complete spam counters so that they don't affect each other.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b6c35462b..2a045195f 100644
+index ae2307612..faee58d45 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -83,7 +83,11 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -31,7 +31,7 @@ index b6c35462b..2a045195f 100644
          /* Use thread-safe field access instead
          if (this.chatThrottle > 0) {
              --this.chatThrottle;
-@@ -2019,8 +2026,16 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -2022,8 +2029,16 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
      public void a(PacketPlayInTabComplete packetplayintabcomplete) {
          PlayerConnectionUtils.ensureMainThread(packetplayintabcomplete, this, this.player.u());
          // CraftBukkit start
@@ -74,5 +74,5 @@ index 26b936404..5fa3aa5b5 100644
      // KigPaper end
  }
 -- 
-2.45.2
+2.51.0