Merge branch 'Team-4---General-Mobs' of github.com:UQcsse3200/2023-st…

…udio-3 into Team-4---General-Mobs
UQcsse3200 · Sep 11, 2023 · ac20c2a · ac20c2a
2 parents 12395d0 + 64512c2
commit ac20c2a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/source/core/src/main/com/csse3200/game/components/tasks/WanderTask.java b/source/core/src/main/com/csse3200/game/components/tasks/WanderTask.java
@@ -82,8 +82,6 @@ public void update() {
     // with section, massive props to him for his help!
     if (!isDead && owner.getEntity().getComponent(CombatStatsComponent.class).isDead()) {
       owner.getEntity().getEvents().trigger("dieStart");
-      //owner.getEntity().getComponent(ColliderComponent.class).setLayer(PhysicsLayer.NONE);
-      //owner.getEntity().getComponent(HitboxComponent.class).setLayer(PhysicsLayer.NONE);
       currentTask.stop();
       isDead = true;
     }

diff --git a/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java b/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java
@@ -140,8 +140,7 @@ public static Entity createBaseNPC(Entity target) {
     AITaskComponent aiComponent =
         new AITaskComponent()
             .addTask(new WanderTask(new Vector2(2f, 2f), 2f))
-            .addTask(new MobAttackTask(2, 40))
-                .addTask(new MobDeathTask(2));
+            .addTask(new MobAttackTask(2, 40));
     Entity npc =
         new Entity()
             .addComponent(new PhysicsComponent())