Change invulnerable logic

Author: zbx1425

common/src/main/java/cn/zbx1425/minopp/entity/EntityAutoPlayer.java

@@ -81,8 +81,9 @@ public void tick() {
         }
 
         // Rate limiting
-        if (!entityData.get(ACTIVE)) {
-            if (noPush) heal(10);
+        if (!getActive()) {
+            tablePos = null;
+            heal(10);
             return;
         }
         if (autoPlayer.aiNoDelay < 2 && level().getGameTime() - lastTickGameTime < 10) {
@@ -120,11 +121,7 @@ public void tick() {
                 if (tableFound) break;
             }
             if (!tableFound) {
-                if (!noPush) {
-                    kill();
-                } else {
-                    entityData.set(ACTIVE, false);
-                }
+                setActive(false);
                 return;
             }
         }
@@ -134,7 +131,6 @@ public void tick() {
         BlockEntity blockEntity = level().getBlockEntity(tablePos);
         if (blockEntity instanceof BlockEntityMinoTable tableEntity) {
             if (tableEntity.game != null) {
-                setInvulnerable(true);
                 heal(10);
                 if (tableEntity.game.players.get(tableEntity.game.currentPlayerIndex).equals(cardPlayer)) {
                     if (autoPlayer.aiNoDelay > 0) {
@@ -164,7 +160,6 @@ public void tick() {
                     isThinking = false;
                 }
             } else {
-                setInvulnerable(false);
                 if (gameEndTime == -1L) {
                     gameEndTime = level().getGameTime() + 100;
                 } else if (level().getGameTime() - gameEndTime <= 20 * 3) {
@@ -189,21 +184,6 @@ public void tick() {
         }
     }
 
-    @Override
-    public boolean hurt(DamageSource source, float amount) {
-        if (source.getEntity() instanceof Player) {
-            if (!entityData.get(ACTIVE)) {
-                entityData.set(ACTIVE, true);
-            } else {
-                if (((Player)source.getEntity()).getMainHandItem().is(net.minecraft.world.item.Items.STICK)) {
-                    entityData.set(ACTIVE, false);
-                    tablePos = null;
-                }
-            }
-        }
-        return super.hurt(source, amount);
-    }
-
     @Override
     public @NotNull InteractionResult interact(Player player, InteractionHand hand) {
         if (level().isClientSide) {
@@ -248,6 +228,16 @@ public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
         return HumanoidArm.RIGHT;
     }
 
+    @Override
+    public boolean isInvulnerable() {
+        return true;
+    }
+
+    @Override
+    public boolean isInvulnerableTo(DamageSource source) {
+        return true;
+    }
+
     @Override
     public void addAdditionalSaveData(CompoundTag compound) {
         super.addAdditionalSaveData(compound);