fix move setup-command

agentcontest · May 16, 2019 · 7c6c38d · 7c6c38d
1 parent fedccb7
commit 7c6c38d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/javaagents/src/main/java/massim/javaagents/agents/BasicAgent.java b/javaagents/src/main/java/massim/javaagents/agents/BasicAgent.java
@@ -38,6 +38,9 @@ public Action step() {
         if (getName().equals("agentA3")) {
             return new Action("submit", new Identifier("test"));
         }
+        if (getName().equals("agentA1")) {
+            return new Action("request", new Identifier("e"));
+        }
         return new Action("move", new Identifier("n"));
     }
 }
diff --git a/server/src/main/java/massim/simulation/game/GameState.java b/server/src/main/java/massim/simulation/game/GameState.java
@@ -379,8 +379,8 @@ String handleConnectAction(Entity entity, Position blockPos, Entity partnerEntit
     }
 
     String handleRequestAction(Entity entity, String direction) {
-        Position requestPosition = entity.getPosition().moved(direction, 1);
-        Dispenser dispenser = dispensers.get(requestPosition);
+        var requestPosition = entity.getPosition().moved(direction, 1);
+        var dispenser = dispensers.get(requestPosition);
         if (dispenser != null && grid.isFree(requestPosition)){
             createBlock(requestPosition, dispenser.getBlockType());
             return Actions.RESULT_SUCCESS;

diff --git a/server/src/main/java/massim/simulation/game/environment/Grid.java b/server/src/main/java/massim/simulation/game/environment/Grid.java
@@ -93,7 +93,8 @@ private void move(Set<Attachable> attachables, Map<Attachable, Position> newPosi
     public void moveWithoutAttachments(Attachable a, Position pos) {
         if(isFree(pos) && a.getAttachments().isEmpty()) {
             removeAttachable(a);
-            insert(a.getID(), a.getPosition());
+            a.setPosition(pos);
+            insert(a.getID(), pos);
         }
     }