给 kill 添加生成墓碑的判定，修正可能存在的女仆丢失问题

TartaricAcid · Jan 21, 2025 · 7fe376a · 7fe376a
1 parent b25fde8
commit 7fe376a
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java
@@ -250,6 +250,10 @@ public class EntityMaid extends TamableAnimal implements CrossbowAttackMob, IMai
      * 女仆主动爬行标志位，用于管控女仆当前时刻需不需要攀爬
      */
     private boolean canClimb = false;
+    /**
+     * 一个记录女仆已经生成墓碑的变量，避免死亡重复生成墓碑
+     */
+    private boolean alreadyDropped = false;
 
     protected EntityMaid(EntityType<EntityMaid> type, Level world) {
         super(type, world);
@@ -1311,10 +1315,22 @@ protected void dropEquipment() {
                 maidWorldData.addTombstones(this, tombstone);
             }
 
+            // 记录墓碑已经生成，避免重复生成
+            alreadyDropped = true;
             level.addFreshEntity(tombstone);
         }
     }
 
+    @Override
+    public void remove(RemovalReason reason) {
+        // TODO: 尝试修复可能存在的目标生成丢失问题，可能会有问题
+        if (reason == RemovalReason.KILLED && !alreadyDropped) {
+            // 女仆被指令杀后也正常生成墓碑
+            this.dropEquipment();
+        }
+        super.remove(reason);
+    }
+
     @Override
     protected void completeUsingItem() {
         this.getSwimManager().resetEatBreatheItem();