Fixed some coding issues

tonihele · Jul 5, 2024 · 0221603 · 0221603
1 parent c45f5ba
commit 0221603
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/toniarts/openkeeper/game/controller/room/storage/RoomTraineeControl.java b/src/toniarts/openkeeper/game/controller/room/storage/RoomTraineeControl.java
@@ -36,7 +36,7 @@
  */
 public abstract class RoomTraineeControl extends AbstractRoomObjectControl<EntityId> {
 
-    public RoomTraineeControl(KwdFile kwdFile, IRoomController parent, IObjectsController objectsController, IGameTimer gameTimer) {
+    protected RoomTraineeControl(KwdFile kwdFile, IRoomController parent, IObjectsController objectsController, IGameTimer gameTimer) {
         super(kwdFile, parent, objectsController, gameTimer);
     }
 

diff --git a/src/toniarts/openkeeper/game/task/TaskManager.java b/src/toniarts/openkeeper/game/task/TaskManager.java
@@ -656,27 +656,29 @@ private static Integer getShortestDistance(Point currentPosition, Point... coord
 
     private AbstractTask getRoomTask(ObjectType objectType, Point target, EntityId targetEntity, ICreatureController creature, IRoomController room) {
         switch (objectType) {
-            case GOLD: {
+            case GOLD -> {
                 return new CarryGoldToTreasuryTask(navigationService, mapController, target, creature.getOwnerId(), room, gameWorldController);
             }
-            case LAIR: {
+            case LAIR -> {
                 return new ClaimLair(navigationService, mapController, target, creature.getOwnerId(), room, this);
             }
-            case RESEARCHER: {
+            case RESEARCHER -> {
                 return new Research(navigationService, mapController, target, creature.getOwnerId(), room, this, playerControllers.get(creature.getOwnerId()).getResearchControl(), objectsController);
             }
-            case PRISONER: {
+            case PRISONER -> {
                 return new CarryEnemyCreatureToPrison(navigationService, mapController, target, creature.getOwnerId(), room, this, creaturesController.createController(targetEntity));
             }
-            case SPECIAL:
-            case SPELL_BOOK: {
+            case SPECIAL, SPELL_BOOK -> {
                 return new CarryObjectToStorageTask(navigationService, mapController, target, creature.getOwnerId(), room, this, objectsController.createController(targetEntity));
             }
-            case TRAINEE: {
+            case TRAINEE -> {
                 return new Train(navigationService, mapController, target, creature.getOwnerId(), room, this, gameWorldController, gameSettings, playerControllers.get(creature.getOwnerId()));
             }
+            default -> {
+                logger.log(Level.DEBUG, "No task defined for " + objectType);
+                return null;
+            }
         }
-        return null;
     }
 
     protected void removeRoomTask(AbstractCapacityCriticalRoomTask task) {