优化一轮圣符传说第二章

EaseCation · Jul 4, 2023 · 5f7be06 · 5f7be06
1 parent 5b239a0
commit 5f7be06
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/main/java/cn/nukkit/entity/EntityLiving.java b/src/main/java/cn/nukkit/entity/EntityLiving.java
@@ -122,13 +122,19 @@ public void collidingWith(Entity ent) { // can override (IronGolem|Bats)
     public boolean attack(EntityDamageEvent source) {
         if (System.currentTimeMillis() < this.nextAllowAttack/*this.attackTime > 0*/) {
             EntityDamageEvent lastCause = this.getLastDamageCause();
-            if (lastCause != null && (lastCause.getFinalDamage() == 0 || lastCause.getCause() == DamageCause.FIRE_TICK)) {
-                //上次伤害是0，这次允许输出
+            if (this instanceof Player) {
+                if (lastCause != null && (lastCause.getFinalDamage() == 0 || lastCause.getCause() == DamageCause.FIRE_TICK)) {
+                    //上次伤害是0，这次允许输出
+                } else {
+                    //叠刀时的自我安慰
+                    if (source instanceof EntityDamageByEntityEvent && source.getCause() == DamageCause.ENTITY_ATTACK && ((EntityDamageByEntityEvent) source).getDamager() instanceof Player)
+                        this.getLevel().addSound(this.add(0, 15, 0), SoundEnum.GAME_PLAYER_HURT, 1, 1, (Player) ((EntityDamageByEntityEvent) source).getDamager());
+                    return false;
+                }
             } else {
-                //叠刀时的自我安慰
-                if (source instanceof EntityDamageByEntityEvent && source.getCause() == DamageCause.ENTITY_ATTACK && ((EntityDamageByEntityEvent) source).getDamager() instanceof Player)
-                    this.getLevel().addSound(this.add(0, 15, 0), SoundEnum.GAME_PLAYER_HURT, 1, 1, (Player) ((EntityDamageByEntityEvent) source).getDamager());
-                return false;
+                if (lastCause != null && lastCause.getDamage() >= source.getDamage()) {
+                    return false;
+                }
             }
         }
         if (this.noDamageTicks > 0) {