Fix one punch man not killing mobs in some cases (#1762)

purpur-server/minecraft-patches/features/0019-Mobs-always-drop-experience.patch

@@ -41,7 +41,7 @@ index a3a98df8ffeb33d86330b5561252eda596642da8..85986d2dc0c12a34f990e4262f79f813
      public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
          return 0.0F;
 diff --git a/net/minecraft/world/entity/animal/bee/Bee.java b/net/minecraft/world/entity/animal/bee/Bee.java
-index 4fba5ce59065ac024a0108726623dab894ae45c5..17ec9642772d02092768da5d5a1396d357199268 100644
+index e85c33e4d0d19d4e7f8ef837ec0a611e19bc19e4..15b48d4b8de0eb2e59667aee9e62c254995e5600 100644
 --- a/net/minecraft/world/entity/animal/bee/Bee.java
 +++ b/net/minecraft/world/entity/animal/bee/Bee.java
 @@ -502,6 +502,13 @@ public class Bee extends Animal implements FlyingAnimal, NeutralMob {
@@ -113,7 +113,7 @@ index d3e5e12c4e3c168a3a15d611f8ae5845ee365080..07a1df530fcd5d684cbba4414ea0fa20
      public float getWalkTargetValue(final BlockPos pos, final LevelReader level) {
          return level.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : level.getPathfindingCostFromLightLevels(pos);
 diff --git a/net/minecraft/world/entity/animal/dolphin/Dolphin.java b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
-index c372a2cc7ec9ac03629a73a45bfc58f77894d63b..4f39f0213f4af3589ed53c7238c91b4300a3b174 100644
+index 0cab39846b6ad5d0e0ce627d6a84f73340fcd328..5e966f61ab5a48c6fc7168af3680ab3133d89365 100644
 --- a/net/minecraft/world/entity/animal/dolphin/Dolphin.java
 +++ b/net/minecraft/world/entity/animal/dolphin/Dolphin.java
 @@ -169,6 +169,13 @@ public class Dolphin extends AgeableWaterCreature {
@@ -167,7 +167,7 @@ index 64603ad973bdb697ca75642e8e42e7052efd4191..5d643be94db358e4093cbb00659a4e90
      protected void randomizeAttributes(final RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(generateMaxHealth(random::nextInt));
 diff --git a/net/minecraft/world/entity/animal/equine/Llama.java b/net/minecraft/world/entity/animal/equine/Llama.java
-index e277a58a1c761198f59b987c95567b6e4d9c440b..fe9d0b7bc5ad62a5455a78ffb6cd04a1b8115932 100644
+index c56d6f3a8a0c5a95da49ab34c72659872259a723..6a59ee64c539c36633ad23c1bcc53cec9426bce5 100644
 --- a/net/minecraft/world/entity/animal/equine/Llama.java
 +++ b/net/minecraft/world/entity/animal/equine/Llama.java
 @@ -165,6 +165,13 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -257,7 +257,7 @@ index 426b468ee821a7441d15dae3634032535cb60725..54cbd5136997bdec34df0f822e21ffe5
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 25.0);
      }
 diff --git a/net/minecraft/world/entity/animal/feline/Cat.java b/net/minecraft/world/entity/animal/feline/Cat.java
-index 0493926c7918059d82bafd20fed0883bb331bd55..74acd2066aa05eb732645912eba7b24252a57f7e 100644
+index 966b2cbc5b4f71d2cfa8759c2263407ee73c3d8e..d28e2ed6e08b708a8eb17645c8406b5d04110500 100644
 --- a/net/minecraft/world/entity/animal/feline/Cat.java
 +++ b/net/minecraft/world/entity/animal/feline/Cat.java
 @@ -142,6 +142,13 @@ public class Cat extends TamableAnimal {
@@ -311,7 +311,7 @@ index f44214eaa47c2021f7ca9c84a7b89be15fecb5bc..7d4bfca8b2608c18fc96e14f1ef91212
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/net/minecraft/world/entity/animal/fish/Pufferfish.java b/net/minecraft/world/entity/animal/fish/Pufferfish.java
-index 17dba2f70251c2d5f75cc116b300f328f117cecb..3d84c136fa944beed72ee2fb8f441bcb4031e233 100644
+index a0f1ea76011dc3aa6e8a702528062f5fafe07e01..a6ac30e39b15493cdee194a79d744d85d54ecdde 100644
 --- a/net/minecraft/world/entity/animal/fish/Pufferfish.java
 +++ b/net/minecraft/world/entity/animal/fish/Pufferfish.java
 @@ -73,6 +73,13 @@ public class Pufferfish extends AbstractFish {
@@ -365,7 +365,7 @@ index 17bc569bf97026e2c072633f1ad6e9e0102c137a..fc500f1ca1d4280519f418cac21688c3
          return "entity.minecraft.tropical_fish.predefined." + index;
      }
 diff --git a/net/minecraft/world/entity/animal/fox/Fox.java b/net/minecraft/world/entity/animal/fox/Fox.java
-index aa419e7cb456f664c1eca1286777caca6bd10e7a..335da522a9b96ebc852b4ed5f22f9fd71aec23a8 100644
+index c70e04d20e37b7063618805016d24a459ee65c91..66001fb6a7264e70f3172ea50c97d0a26214a5fd 100644
 --- a/net/minecraft/world/entity/animal/fox/Fox.java
 +++ b/net/minecraft/world/entity/animal/fox/Fox.java
 @@ -215,6 +215,13 @@ public class Fox extends Animal {
@@ -383,7 +383,7 @@ index aa419e7cb456f664c1eca1286777caca6bd10e7a..335da522a9b96ebc852b4ed5f22f9fd7
      protected void defineSynchedData(final SynchedEntityData.Builder entityData) {
          super.defineSynchedData(entityData);
 diff --git a/net/minecraft/world/entity/animal/goat/Goat.java b/net/minecraft/world/entity/animal/goat/Goat.java
-index 0d40bbd8c42178c712f23300364138389ecde548..afc1119a6b562013a09a607ecc430d7bd46e6c82 100644
+index 24cccc6afadfc91feb6157882c1b76da0d3657d1..ae262e0956a7f468d01a669f827f0c08142804fa 100644
 --- a/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -131,6 +131,13 @@ public class Goat extends Animal {
@@ -455,7 +455,7 @@ index 2d3127f6846ff9eda1a0b89764dc837da6e7e0c7..ffb0e9cc4f8604fd03cb3a2412001182
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur - Ridables
 diff --git a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
-index d3367430da307e2c0748874cbe77f265860152a0..908e26a3aeb843585d9938f588d33b5bb5326ebe 100644
+index a73d8d3eb04602eac78f142c336e464de22ecc83..aed715317114374213bfb60b18a5bf57632459f8 100644
 --- a/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
 +++ b/net/minecraft/world/entity/animal/happyghast/HappyGhast.java
 @@ -168,6 +168,13 @@ public class HappyGhast extends Animal {
@@ -509,7 +509,7 @@ index ab97449bfa5e8b5615e0f2b6b16be2fe7e4233fd..869cec108d33626362400e9aa4890a92
          return AbstractNautilus.createAttributes().add(Attributes.MOVEMENT_SPEED, 1.1F);
      }
 diff --git a/net/minecraft/world/entity/animal/panda/Panda.java b/net/minecraft/world/entity/animal/panda/Panda.java
-index f97b8feaedb84baf479998cef7257231f85412d6..72ced157956c6a809d8d9f21027f21c0465b8677 100644
+index 2f9f588c384d133f82bb4b2d08c8f7c7a72c0915..0480c5851ff94e095bc54106051d0ca4d2db82e0 100644
 --- a/net/minecraft/world/entity/animal/panda/Panda.java
 +++ b/net/minecraft/world/entity/animal/panda/Panda.java
 @@ -160,6 +160,13 @@ public class Panda extends Animal {
@@ -599,7 +599,7 @@ index 7dade80db9430e4db587ed23df992d70c6b7ee04..937ce47e45698392fad3fdc6eeb85e78
      public void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/net/minecraft/world/entity/animal/sheep/Sheep.java b/net/minecraft/world/entity/animal/sheep/Sheep.java
-index 0ceaa6dd493d0258c419d8b5c4394b35c0808704..55cc6040e606918042c76a7bc6cbe1a1b965c407 100644
+index 49389028a34971bbd1c480ba91e2b53d3c26513c..f0ff3484c73b2348e7b2239517c8984422cd1bdd 100644
 --- a/net/minecraft/world/entity/animal/sheep/Sheep.java
 +++ b/net/minecraft/world/entity/animal/sheep/Sheep.java
 @@ -102,6 +102,13 @@ public class Sheep extends Animal implements Shearable {
@@ -635,7 +635,7 @@ index 1fa3d614dd1c45ec42caffbe92e3f8db02b399b1..0f4587df333a68627d6db18c0583ae1e
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/net/minecraft/world/entity/animal/squid/Squid.java b/net/minecraft/world/entity/animal/squid/Squid.java
-index e350763a3a22d825a25f02b60bd4c9223aa81f62..0a3327e22f5a2e30c70248ab46078e50281bd429 100644
+index 8b26b08956e63d3ccb9a7006cfa57ac3771339ad..3f197daef44cafb00390d0e429eceae8505d9c1d 100644
 --- a/net/minecraft/world/entity/animal/squid/Squid.java
 +++ b/net/minecraft/world/entity/animal/squid/Squid.java
 @@ -111,6 +111,13 @@ public class Squid extends AgeableWaterCreature {
@@ -671,7 +671,7 @@ index 6d09c0de38f2c91d2a0ab6dd0b694ab42b48a981..37345edf599a43ac48274e30f5d7aa34
          this.homePos = pos;
      }
 diff --git a/net/minecraft/world/entity/animal/wolf/Wolf.java b/net/minecraft/world/entity/animal/wolf/Wolf.java
-index 781cac493f909b02483e5c4064cc2cc791b1dabd..fed2456921421eb6c95a4d713a4bd0ed64c1415a 100644
+index cd7981c9c040e1b745e08680bf3685903cbda8ff..12f7874e28ae964c7d68bee4a4c3ac0a47b369ba 100644
 --- a/net/minecraft/world/entity/animal/wolf/Wolf.java
 +++ b/net/minecraft/world/entity/animal/wolf/Wolf.java
 @@ -227,6 +227,13 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -689,7 +689,7 @@ index 781cac493f909b02483e5c4064cc2cc791b1dabd..fed2456921421eb6c95a4d713a4bd0ed
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 10818999c4e796a4dfd5a7dd21772c9eb8ca2579..4677996d778fbd1ffa7c1278bf4ebd8ce1097eb9 100644
+index 5e206030d9ccabbefe9c64332125526030d65750..a94d2d9bc5a5795a0c88348a61dff936d31d12b5 100644
 --- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -229,6 +229,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
@@ -797,7 +797,7 @@ index 859d490dd3be2843dde3a811bcc0d51e3eae76f0..b93a5d46ccf7b2dad6afbd15884f8d8a
      protected void registerGoals() {
          this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/net/minecraft/world/entity/monster/Ghast.java b/net/minecraft/world/entity/monster/Ghast.java
-index 89a2097c2c26dae7f12ddbac10bc091ec7f228d7..753ba768318b2ecda5efdbd00b408aa7e1b2c56b 100644
+index 64800fe5cfb3488b63126ed09f1f678d6ebd1d3b..b87ee7a7b92f49b72151019bf05995a6843ec7fa 100644
 --- a/net/minecraft/world/entity/monster/Ghast.java
 +++ b/net/minecraft/world/entity/monster/Ghast.java
 @@ -90,6 +90,13 @@ public class Ghast extends Mob implements Enemy {
@@ -833,7 +833,7 @@ index 43ebfe06ce2a8c15787d72a8ef54cd6c7cac2bfc..07dfe0e6fd431b8417fc7f823962e4d4
          return Monster.createMonsterAttributes()
              .add(Attributes.MAX_HEALTH, 100.0)
 diff --git a/net/minecraft/world/entity/monster/Guardian.java b/net/minecraft/world/entity/monster/Guardian.java
-index 9ca62d9663fc2e8eb49780ceb7ff38e0363a09a6..ef66a8e8973e0af6a3826b7b6819b9bf89af86dd 100644
+index ea7e6a1b4dad1b702ddc5b6004c5ebdfd541334d..520e9e7e99c03f07087bd51d19db730aa98cd6b9 100644
 --- a/net/minecraft/world/entity/monster/Guardian.java
 +++ b/net/minecraft/world/entity/monster/Guardian.java
 @@ -104,6 +104,13 @@ public class Guardian extends Monster {
@@ -869,7 +869,7 @@ index fba41f261e57a050d4e24d2611cc27edcbb84ddf..4e757fc7d49c22f79eceafc02ff05da5
          return Monster.createMonsterAttributes().add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
-index 6b6eed1c636f2ca65d0cbcd71e96bdd1b2063267..2b799c73bb384bdb778edda66bbb00c4ba70a2bf 100644
+index 0f1081b448ce03498b471f7d3c2ff63deee13268..05ae5d0a41cf0f3c4bb2da1395e64b31f45418ae 100644
 --- a/net/minecraft/world/entity/monster/Phantom.java
 +++ b/net/minecraft/world/entity/monster/Phantom.java
 @@ -137,6 +137,13 @@ public class Phantom extends Mob implements Enemy {
@@ -887,7 +887,7 @@ index 6b6eed1c636f2ca65d0cbcd71e96bdd1b2063267..2b799c73bb384bdb778edda66bbb00c4
      public boolean isFlapping() {
          return (this.getUniqueFlapTickOffset() + this.tickCount) % TICKS_PER_FLAP == 0;
 diff --git a/net/minecraft/world/entity/monster/Ravager.java b/net/minecraft/world/entity/monster/Ravager.java
-index bb19e3f2e6522e8b7db32061c0ae2b2a37679369..8dc443aa7847789117f6cb86415d6dd082a93e2f 100644
+index 3e0403635cb9ce3d0894705db6727d9a7cc4d628..700799d2cedea989ac60d7c5dfc563c99db9f537 100644
 --- a/net/minecraft/world/entity/monster/Ravager.java
 +++ b/net/minecraft/world/entity/monster/Ravager.java
 @@ -108,6 +108,13 @@ public class Ravager extends Raider {
@@ -905,7 +905,7 @@ index bb19e3f2e6522e8b7db32061c0ae2b2a37679369..8dc443aa7847789117f6cb86415d6dd0
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/net/minecraft/world/entity/monster/Shulker.java b/net/minecraft/world/entity/monster/Shulker.java
-index cf49a580c8dacb895b7a8ec2531d3afee2ffc30c..62bf636b9fb0f13ef7d5787001df0902719bcadf 100644
+index 67aa12ee4a58e7cd31efb47cd1d71eaa2cc6af7d..0224a0dca4432fa33262ffa7152eb228a88c20d5 100644
 --- a/net/minecraft/world/entity/monster/Shulker.java
 +++ b/net/minecraft/world/entity/monster/Shulker.java
 @@ -142,6 +142,13 @@ public class Shulker extends AbstractGolem implements Enemy {
@@ -941,7 +941,7 @@ index 205c05f46d70d37e11a0e35c97128e0c20b94e23..b45f8eb2bd1d9b3c91716bf329febe92
      protected void registerGoals() {
          this.friendsGoal = new Silverfish.SilverfishWakeUpFriendsGoal(this);
 diff --git a/net/minecraft/world/entity/monster/Slime.java b/net/minecraft/world/entity/monster/Slime.java
-index 556930ac4d06b4f46a87d237857006729fea5ef5..dd21ca5047d16af2d7ed28c97976d845eab1b470 100644
+index 834125d0ded28a1d7a39a3e5fcf6a5bb967c7f91..0636fdf31330da5523b9ad11869776a21a6f68b1 100644
 --- a/net/minecraft/world/entity/monster/Slime.java
 +++ b/net/minecraft/world/entity/monster/Slime.java
 @@ -142,6 +142,13 @@ public class Slime extends Mob implements Enemy {
@@ -977,7 +977,7 @@ index 1b6137674d807ed29d56e3f3120abe60254274e1..7c05c394138699c199e2044325d29482
          final EntityType<Strider> ignoredType,
          final LevelAccessor level,
 diff --git a/net/minecraft/world/entity/monster/Vex.java b/net/minecraft/world/entity/monster/Vex.java
-index c7700ff6b7faf06116626ad95e11cd4604751eda..97177c9f1982e348e4987f254a9daeeac5da1cbe 100644
+index 917f256f072ba29ae77e4976dd4d49ffcb2a0e35..d280201dfdd5c6114a00d5d245d839d271177854 100644
 --- a/net/minecraft/world/entity/monster/Vex.java
 +++ b/net/minecraft/world/entity/monster/Vex.java
 @@ -118,6 +118,13 @@ public class Vex extends Monster implements TraceableEntity {
@@ -1049,7 +1049,7 @@ index d001cf955dba66435079eb2cc30e05aec963d2c6..b8c764cc274f43073a460a4c8643e0cb
      public void setTimeInOverworld(final int timeInOverworld) {
          this.timeInOverworld = timeInOverworld;
 diff --git a/net/minecraft/world/entity/monster/illager/Evoker.java b/net/minecraft/world/entity/monster/illager/Evoker.java
-index 75276deb3208437fce669f9e483ff6c7a99d69a3..452ed8d77c84c26c711531f36f47e84b7379361f 100644
+index a766f1139459488accd0d720be3ff522e88c3d09..c5d56a3c2dff087453d56821ef6c4d75c1274613 100644
 --- a/net/minecraft/world/entity/monster/illager/Evoker.java
 +++ b/net/minecraft/world/entity/monster/illager/Evoker.java
 @@ -82,6 +82,13 @@ public class Evoker extends SpellcasterIllager {
@@ -1229,7 +1229,7 @@ index cbbfdd2dde1437955f1007618244eeb72768b8fd..24b5ba31c92923545d5b7cab758c2e30
      public boolean doHurtTarget(final ServerLevel level, final Entity target) {
          if (super.doHurtTarget(level, target)) {
 diff --git a/net/minecraft/world/entity/monster/spider/Spider.java b/net/minecraft/world/entity/monster/spider/Spider.java
-index 43c50e6808eaab4bb31ffbbc633a66bab49b9574..408bfd276b7a70103ede33f3b87d4dc1b10d34f5 100644
+index 467ea1fd09b94747a03aaadd28a107d983afeb01..8396b9d6b41e381e040ee71e7fe04ad20af63039 100644
 --- a/net/minecraft/world/entity/monster/spider/Spider.java
 +++ b/net/minecraft/world/entity/monster/spider/Spider.java
 @@ -84,6 +84,13 @@ public class Spider extends Monster {
@@ -1283,7 +1283,7 @@ index 02e935edd7a6cabbf2e6fcc6c96a9601bee71acc..5d60b230eeaec9d37e286019b8d4276c
      public boolean isSunSensitive() {
          return this.shouldBurnInDay; // Purpur - moved to LivingEntity; keep methods for ABI compatibility - API for any mob to burn daylight
 diff --git a/net/minecraft/world/entity/monster/zombie/Zombie.java b/net/minecraft/world/entity/monster/zombie/Zombie.java
-index dffb152543d06380618c36cf89374b7d11336039..68070943966aac17e1878f6730781cf2b603be7a 100644
+index f8eccfab70e7d99dd74965a506837e620515b6d1..cb1a685b136f06ab5884c269678cc9384af1dfed 100644
 --- a/net/minecraft/world/entity/monster/zombie/Zombie.java
 +++ b/net/minecraft/world/entity/monster/zombie/Zombie.java
 @@ -160,6 +160,13 @@ public class Zombie extends Monster {
@@ -1337,7 +1337,7 @@ index 6cc4d4729520c60b98d45d5e7dd674e599616505..9e893c0c033dcc2273275b92048d9b1a
      protected void addBehaviourGoals() {
          this.goalSelector.addGoal(1, new SpearUseGoal<>(this, 1.0, 1.0, 10.0F, 2.0F));
 diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
-index fe93e373ea46970af5ca117e80a7d5a2497afeca..297eba0bcf340f83c5d12ced343ccbfc738d4d35 100644
+index 033c9322234378c46e9a6e549d04f32135243ed9..f439a0b0830e74be8c123a5b2e55933671715f74 100644
 --- a/net/minecraft/world/entity/npc/villager/Villager.java
 +++ b/net/minecraft/world/entity/npc/villager/Villager.java
 @@ -291,6 +291,13 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re