Respect attack speed

Author: Malfrador

papyrus-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch

@@ -27,7 +27,7 @@
                  if (damaged) {
                      this.removeEntitiesOnShoulder();
                  }
-@@ -1174,37 +_,39 @@
+@@ -1174,15 +_,15 @@
          // Paper start - PlayerAttackEntityEvent
          boolean willAttack = target.isAttackable() && !target.skipAttackInteraction(this); // Vanilla logic
          io.papermc.paper.event.player.PrePlayerAttackEntityEvent playerAttackEntityEvent = new io.papermc.paper.event.player.PrePlayerAttackEntityEvent(
@@ -47,9 +47,8 @@
 +                float f = this.isAutoSpinAttack() ? this.autoSpinAttackDmg : (float) this.getAttributeValue(attackDamageType.advantage); // Papyrus - Add damage type
                  ItemStack weaponItem = this.getWeaponItem();
                  DamageSource damageSource = Optional.ofNullable(weaponItem.getItem().getDamageSource(this)).orElse(this.damageSources().playerAttack(this));
--                float f1 = this.getEnchantedDamage(target, f, damageSource) - f;
-+                float f1 = this.getEnchantedDamage(target, f, damageSource) - f; // Papyrus - Remove attack cooldown
-                 float attackStrengthScale = this.getAttackStrengthScale(0.5F);
+                 float f1 = this.getEnchantedDamage(target, f, damageSource) - f;
+@@ -1190,16 +_,18 @@
                  f *= 0.2F + attackStrengthScale * attackStrengthScale * 0.8F;
                  f1 *= attackStrengthScale;
                  // this.resetAttackStrengthTicker(); // CraftBukkit - Moved to EntityLiving to reset the cooldown after the damage is dealt
@@ -77,12 +76,6 @@
                  }
                  {
                      // CraftBukkit end
-                     if (f > 0.0F || f1 > 0.0F) {
--                        boolean flag = attackStrengthScale > 0.9F;
-+                        boolean flag = true; //attackStrengthScale > 0.9F; - Papyrus - Remove attack cooldown
-                         boolean flag1;
-                         if (this.isSprinting() && flag) {
-                             this.sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_KNOCKBACK, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
 @@ -1215,14 +_,14 @@
 
                          f += weaponItem.getItem().getAttackDamageBonus(target, f, damageSource);
@@ -106,7 +99,7 @@
                          flag2 = flag2 && !this.level().paperConfig().entities.behavior.disablePlayerCrits; // Paper - Toggleable player crits
                          if (flag2) {
                              damageSource = damageSource.critical(); // Paper - critical damage API
-@@ -1245,147 +_,165 @@
+@@ -1245,146 +_,165 @@
                          }
 
                          Vec3 deltaMovement = target.getDeltaMovement();
@@ -164,12 +157,11 @@
 -                                        && !this.isAlliedTo(livingEntity2)
 -                                        && !(livingEntity2 instanceof ArmorStand armorStand && armorStand.isMarker())
 -                                        && this.distanceToSqr(livingEntity2) < 9.0) {
--                                        float f6 = this.getEnchantedDamage(livingEntity2, f5, damageSource) * attackStrengthScale;
 +                                            && livingEntity2 != target
 +                                            && !this.isAlliedTo(livingEntity2)
 +                                            && (!(livingEntity2 instanceof ArmorStand) || !((ArmorStand) livingEntity2).isMarker())
 +                                            && this.distanceToSqr(livingEntity2) < 9.0) {
-+                                        float f6 = this.getEnchantedDamage(livingEntity2, f5, damageSource);// * attackStrengthScale; Papyrus - Remove attack cooldown
+                                         float f6 = this.getEnchantedDamage(livingEntity2, f5, damageSource) * attackStrengthScale;
                                          // Paper start - Only apply knockback if the event is not cancelled
                                          livingEntity2.lastDamageCancelled = false;
 -                                        if (this.level() instanceof ServerLevel serverLevel && livingEntity2.hurtServer(serverLevel, damageSource.knownCause(org.bukkit.event.entity.EntityDamageEvent.DamageCause.ENTITY_SWEEP_ATTACK), f6) && !livingEntity2.lastDamageCancelled) {
@@ -322,7 +314,6 @@
 -                            this.causeFoodExhaustion(this.level().spigotConfig.combatExhaustion, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.ATTACK); // CraftBukkit - EntityExhaustionEvent // Spigot - Change to use configurable value
 -                        } else {
 -                            sendSoundEffect(this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F); // Paper - send while respecting visibility
--                            this.containerMenu.sendAllDataToRemote(); // CraftBukkit - resync on cancelled event
 +                                        this.sendSoundEffect(
 +                                                this, this.getX(), this.getY(), this.getZ(), SoundEvents.PLAYER_ATTACK_WEAK, this.getSoundSource(), 1.0F, 1.0F // Paper - send while respecting visibility
 +                                        );