patch: only calculate server-side interactions for attacks

For right-clicks, it's better to use the entity the client requested.
ProjectKig · Nov 8, 2024 · c7e2a66 · c7e2a66
1 parent 79b060b
commit c7e2a66
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Spigot-Server-Patches/0235-Extend-hit-recalculation-to-intangible-entities.patch b/Spigot-Server-Patches/0235-Extend-hit-recalculation-to-intangible-entities.patch
@@ -21,7 +21,8 @@ index 1aa0d226..b6c35462 100644
          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) {
++            if (PaperSpigotConfig.betterVehicleHitboxes && packetplayinuseentity.a() == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK) {
 -                if (entity instanceof EntityPlayer && entity.vehicle != null && !((EntityPlayer) entity).collidesWithEntities) {
 +                Predicate<? super Entity> recalcHitPredicate = null;
 +                if (entity == player.passenger) {