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

This commit is contained in:
Amine Kacimi
2026-04-12 22:59:27 +01:00
committed by GitHub
parent 7a3d9a1e3b
commit e64b1b2add
15 changed files with 75 additions and 75 deletions

View File

@@ -31,7 +31,7 @@ index af2bd8a5cf760792a63dfb9c2370360f288beab6..016167a6ff90dfe5a2e66596eaab2c8f
@Override
diff --git a/net/minecraft/world/entity/npc/villager/AbstractVillager.java b/net/minecraft/world/entity/npc/villager/AbstractVillager.java
index f6ac52144958b48dad0b0f682634fad3d8e9557c..0825e06843c3613843cf7c15fa3fb3a1c0787781 100644
index b5247d45159898cd6ede425a4a99db8439a105b6..0c9fba0e41126a585c2471abc2f18ff50a691805 100644
--- a/net/minecraft/world/entity/npc/villager/AbstractVillager.java
+++ b/net/minecraft/world/entity/npc/villager/AbstractVillager.java
@@ -52,6 +52,7 @@ import org.jspecify.annotations.Nullable;
@@ -43,7 +43,7 @@ index f6ac52144958b48dad0b0f682634fad3d8e9557c..0825e06843c3613843cf7c15fa3fb3a1
private static final EntityDataAccessor<Integer> DATA_UNHAPPY_COUNTER = SynchedEntityData.defineId(AbstractVillager.class, EntityDataSerializers.INT);
private @Nullable Player tradingPlayer;
diff --git a/net/minecraft/world/entity/npc/villager/Villager.java b/net/minecraft/world/entity/npc/villager/Villager.java
index ddbfcf8e16e17a3f482cb99de61ae8e40a383c18..6105aa39baf888dd625f4d345822a4058bf83ef4 100644
index 80f5197c4b33d75ee4d3791db22ed5e43f5c2a65..19bba23d87543574d5d8a4139ac93e751fe690d9 100644
--- a/net/minecraft/world/entity/npc/villager/Villager.java
+++ b/net/minecraft/world/entity/npc/villager/Villager.java
@@ -271,6 +271,7 @@ public class Villager extends AbstractVillager implements VillagerDataHolder, Re