Merge pull request tonihele#488 from tonihele/bugfix/room_owner_fix

Take room owner from the room itself, not from the obsoletish roomins…

Author: tonihele

src/toniarts/openkeeper/game/controller/room/storage/RoomGoldControl.java

@@ -86,7 +86,7 @@ private int putGold(int sum, Point p) {
 
             // Add the visuals
             if (goldPile == null) {
-                EntityId entityId = objectsController.addRoomGold(parent.getRoomInstance().getOwnerId(), p.x, p.y, pointStoredGold, getGoldPerObject());
+                EntityId entityId = objectsController.addRoomGold(parent.getOwnerId(), p.x, p.y, pointStoredGold, getGoldPerObject());
                 if (goldPiles == null) {
                     goldPiles = new ArrayList<>(1);
                 }
@@ -127,7 +127,7 @@ public void destroy() {
         // Create the loose gold
         if (!storedGoldList.isEmpty()) {
             for (Entry<Point, Integer> entry : storedGoldList.entrySet()) {
-                objectsController.addLooseGold(parent.getRoomInstance().getOwnerId(), entry.getKey().x, entry.getKey().y, entry.getValue(), getGoldPerObject());
+                objectsController.addLooseGold(parent.getOwnerId(), entry.getKey().x, entry.getKey().y, entry.getValue(), getGoldPerObject());
             }
         }
     }

src/toniarts/openkeeper/game/logic/ChickenSpawnSystem.java

@@ -151,9 +151,9 @@ private void evaluateAndSpawnCreature(IChickenGenerator entrance, double gameTim
 
                 // Spawn chicken
                 Point entranceCoordinate = entrance.getEntranceCoordinate();
-                entityId = objectsController.spawnChicken(entrance.getRoomInstance().getOwnerId(), WorldUtils.pointToVector3f(entranceCoordinate));
+                entityId = objectsController.spawnChicken(entrance.getOwnerId(), WorldUtils.pointToVector3f(entranceCoordinate));
                 spawned = true;
-            } else if (freeRangeChickensByPlayer.get(entrance.getRoomInstance().getOwnerId()).size() < maximumFreerangeChickenCount && freerangeChickenGeneratorsByRoom.get(entrance) != null) {
+            } else if (freeRangeChickensByPlayer.get(entrance.getOwnerId()).size() < maximumFreerangeChickenCount && freerangeChickenGeneratorsByRoom.get(entrance) != null) {
                 Set<EntityId> generators = freerangeChickenGeneratorsByRoom.get(entrance);
                 Optional<EntityId> generator = Utils.getRandomItem(generators);
                 if (generator.isPresent()) {
@@ -162,7 +162,7 @@ private void evaluateAndSpawnCreature(IChickenGenerator entrance, double gameTim
                     // Don't give the entity ID, it is not added to room inventory
                     // TODO: Need to have the generator IN USE component etc. This goes for all the objects, how we use them
                     Position position = entityData.getComponent(generator.get(), Position.class);
-                    objectsController.spawnFreerangeChicken(entrance.getRoomInstance().getOwnerId(), position.position.clone(), gameTime);
+                    objectsController.spawnFreerangeChicken(entrance.getOwnerId(), position.position.clone(), gameTime);
                     spawned = true;
                 }
             }

src/toniarts/openkeeper/game/logic/CreatureSpawnSystem.java

@@ -119,7 +119,7 @@ private void evaluateAndSpawnCreature(ICreatureEntrance entrance, double gameTim
         }
 
         double timeSinceLastSpawn = gameTime - entrance.getLastSpawnTime();
-        IPlayerController player = playerControllersById.get(entrance.getRoomInstance().getOwnerId());
+        IPlayerController player = playerControllersById.get(entrance.getOwnerId());
         boolean spawned = false;
         EntityId entityId = null;
         if (timeSinceLastSpawn >= freeImpCoolDownTime && entrance.isDungeonHeart()) {

src/toniarts/openkeeper/game/logic/LooseObjectSystem.java

@@ -103,7 +103,7 @@ public void processTick(float tpf, double gameTime) {
             IRoomController roomController = mapController.getRoomControllerByCoordinates(point);
             ObjectComponent objectComponent = entity.get(ObjectComponent.class);
             if (roomController != null && objectComponent.objectType != null && roomController.hasObjectControl(objectComponent.objectType) && !roomController.getObjectControl(objectComponent.objectType).isFullCapacity()) {
-                short ownerId = roomController.getRoomInstance().getOwnerId();
+                short ownerId = roomController.getOwnerId();
                 if (objectComponent.objectType == AbstractRoomController.ObjectType.GOLD) {
                     synchronized (GameWorldController.GOLD_LOCK) {
                         Gold gold = entityData.getComponent(entityId, Gold.class);

src/toniarts/openkeeper/game/task/AbstractRoomTask.java

@@ -47,7 +47,7 @@ protected IRoomController getRoom() {
     public boolean isValid(ICreatureController creature) {
 
         // See that the room exists and has capacity etc.
-        return room.getRoomInstance().getOwnerId() == playerId && !room.isDestroyed() && !getRoomObjectControl().isFullCapacity();
+        return room.getOwnerId() == playerId && !room.isDestroyed() && !getRoomObjectControl().isFullCapacity();
     }
 
     protected abstract ObjectType getRoomObjectType();