1 files changed, 2 insertions, 7 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index eca6e64..7a28a70 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -273,10 +273,8 @@ public abstract class Map extends Board
         if (entry == Orientation.KEEP)
             return false;
 
-        Move move = Move.get(unit, null, to, entry, null);
-        move.setEnter();
 
-        enterPawn(unit, move);
+        enterPawn(unit, Move.getEnter(unit, to, entry));
         objectives.claim(to, unit.getArmy());
         return true;
     }
@@ -285,10 +283,7 @@ public abstract class Map extends Board
     {
         TankOnTank.debug("Map", String.format("set %s %s %s", to.toShort(), unit, entry));
 
-        Move move = Move.get(unit, null, to, entry, null);
-        move.setSet();
-
-        setPawnOnto(unit, move);
+        setPawnOnto(unit, Move.getSet(unit, to, entry));
         objectives.claim(to, unit.getArmy());
         return true;
     }