From 36d4413f3b88e81e2e1a481ad80fc5a567e5b066 Mon Sep 17 00:00:00 2001
From: cindyle1 <cindylee4675@gmail.com>
Date: Sat, 14 Oct 2023 12:32:06 +1000
Subject: [PATCH] Fixed merge conflict errors with split

---
 .../main/com/csse3200/game/entities/factories/NPCFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 71502d065..54ea776e9 100644
--- a/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java
+++ b/source/core/src/main/com/csse3200/game/entities/factories/NPCFactory.java
@@ -617,7 +617,7 @@ public static Entity createSplittingWaterSlime(int health) {
   public static Entity createSplittingRocky(int health) {
     Entity splitRocky = createRocky(health)
 
-            .addComponent(new SplitMoblings(7, 0.5f));
+            .addComponent(new SplitMoblings(MobType.ROCKY, 7, 0.5f));
 
     return splitRocky;
   }