From f7b071b6243a210c0e286ccb554d510894e09705 Mon Sep 17 00:00:00 2001
From: Chara1236 <Charliezhao06@gmail.com>
Date: Sat, 11 Jun 2022 23:48:57 -0400
Subject: [PATCH] Dead enemies dont kill

---
 src/BombDirectionShow.java |  3 ++-
 src/GamePanel.java         | 13 ++++++++++++-
 src/NonPlayer.java         |  2 +-
 src/StickyBomb.java        |  7 +------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/BombDirectionShow.java b/src/BombDirectionShow.java
index 676084a..2217781 100644
--- a/src/BombDirectionShow.java
+++ b/src/BombDirectionShow.java
@@ -7,11 +7,12 @@ public class BombDirectionShow extends StickyBomb{
     }
 
     public void draw(Graphics g){
+        update();
         isMove = true;
         int loopCounter = 0;
         while(isMove&&loopCounter<10) {
             super.move();
-            if(isMove) {
+            if(isMove&&canUpdate(0,0)) {
                 g.drawRect(x - GamePanel.camera.x + Player.PLAYER_WIDTH / 2, y + Player.PLAYER_HEIGHT / 2, 2, 2);
             }
             loopCounter++;
diff --git a/src/GamePanel.java b/src/GamePanel.java
index 92f88f0..806c34e 100644
--- a/src/GamePanel.java
+++ b/src/GamePanel.java
@@ -241,7 +241,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
     for (NonPlayer n: enemy) {
       n.update();
       n.isGrounded = false;
-      if(n.collidePlayer(player)){
+      if(n.collidePlayer(player)&&!n.isDead){
         player.alive = false;
       }
     }
@@ -295,6 +295,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
             throw new RuntimeException(e);
           }
           checkCollision();
+          updateEnemy();
           try {
             updateParticle();
           } catch (IOException e) {
@@ -312,6 +313,16 @@ public class GamePanel extends JPanel implements Runnable, KeyListener{
     }
   }
 
+  public void updateEnemy(){
+    for(int i=0; i<enemy.size(); i++){
+      if(enemy.get(i).isDead){
+        enemy.get(i).fadeCounter--;
+        if(enemy.get(i).fadeCounter<=0){
+          enemy.remove(i);
+        }
+      }
+    }
+  }
   public void updateParticle() throws IOException {
     for(Tile t: particleTiles){
       if(GlobalState.randInt(1,10)==1) {
diff --git a/src/NonPlayer.java b/src/NonPlayer.java
index 64578bf..bfc261c 100644
--- a/src/NonPlayer.java
+++ b/src/NonPlayer.java
@@ -36,7 +36,7 @@ public class NonPlayer extends GenericSprite {
     HEIGHT = npcHeight;
 
     xVelocity = 3;
-    fadeCounter = GlobalState.second*3;;
+    fadeCounter = 100;;
   }
 
 
diff --git a/src/StickyBomb.java b/src/StickyBomb.java
index e0724b0..94c0e54 100644
--- a/src/StickyBomb.java
+++ b/src/StickyBomb.java
@@ -64,12 +64,7 @@ public class StickyBomb extends GenericSprite{
         if(eHypo<200){
             GamePanel.enemy.get(i).isDead = true;
         }
-        if(GamePanel.enemy.get(i).isDead){
-            GamePanel.enemy.get(i).fadeCounter--;
-            if(GamePanel.enemy.get(i).fadeCounter<=0){
-                GamePanel.enemy.remove(i);
-            }
-        }
+
     }
     }