Fixed merge conflict errors with split

UQcsse3200 · Oct 14, 2023 · 36d4413 · 36d4413
1 parent 300e240
commit 36d4413
Showing 1 changed file with 1 addition and 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
@@ -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;
   }