diff --git a/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java b/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java
index 116e69262d..299d38aa33 100644
--- a/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java
+++ b/src/main/java/main/CalculaChroniclesOfTheAlgorithmicKingdom.java
@@ -14,6 +14,7 @@ public static void main(String[] args) {
     }
 
     public void startGame() {
+        assert false : "dummy assertion set to fail";
         PlayerStatus playerStatus = new PlayerStatus(100, 0, 0);
         TextBox textBox = new TextBox();
         Parser parser = new Parser();
diff --git a/src/main/java/map/AMap.java b/src/main/java/map/AMap.java
index 653de11911..cdf702d4c4 100644
--- a/src/main/java/map/AMap.java
+++ b/src/main/java/map/AMap.java
@@ -38,39 +38,51 @@ public void initPlayerLocation(int x, int y) {
         }
     }
 
-
     public void movePlayerUpOne() {
         if (this.playerY - 1 >= 0) {
-            currentMap.get(playerY).set(playerX, '.');
-            currentMap.get(playerY - 1).set(playerX, 'P');
-            this.playerY -= 1;
+            if (currentMap.get(playerY - 1).get(playerX) == '@') {
+                System.out.println("MONSTER HERE\n");
+            } else {
+                currentMap.get(playerY).set(playerX, '.');
+                currentMap.get(playerY - 1).set(playerX, 'P');
+                this.playerY -= 1;
+            }
         }
     }
 
-
     public void movePlayerDownOne() {
         if (this.playerY + 1 < height) {
-            currentMap.get(playerY).set(playerX, '.');
-            currentMap.get(playerY + 1).set(playerX, 'P');
-            this.playerY += 1;
+            if (currentMap.get(playerY + 1).get(playerX) == '@') {
+                System.out.println("MONSTER HERE\n");
+            } else {
+                currentMap.get(playerY).set(playerX, '.');
+                currentMap.get(playerY + 1).set(playerX, 'P');
+                this.playerY += 1;
+            }
         }
     }
 
-
     public void movePlayerLeftOne() {
         if (this.playerX - 1 >= 0) {
-            currentMap.get(playerY).set(playerX, '.');
-            currentMap.get(playerY).set(playerX - 1, 'P');
-            this.playerX -= 1;
+            if (currentMap.get(playerY).get(playerX - 1) == '@') {
+                System.out.println("MONSTER HERE\n");
+            } else {
+                currentMap.get(playerY).set(playerX, '.');
+                currentMap.get(playerY).set(playerX - 1, 'P');
+                this.playerX -= 1;
+            }
         }
     }
 
-
     public void movePlayerRightOne() {
-        if (this.playerY + 1 < width) {
-            currentMap.get(playerY).set(playerX, '.');
-            currentMap.get(playerY).set(playerX + 1, 'P');
-            this.playerX += 1;
+        if (this.playerX + 1 < width) {
+            if (currentMap.get(playerY).get(playerX + 1) == '@') {
+                System.out.println("MONSTER HERE\n");
+            } else {
+                currentMap.get(playerY).set(playerX, '.');
+                currentMap.get(playerY).set(playerX + 1, 'P');
+                this.playerX += 1;
+            }
         }
     }
 
diff --git a/tp b/tp
new file mode 160000
index 0000000000..c09c893058
--- /dev/null
+++ b/tp
@@ -0,0 +1 @@
+Subproject commit c09c8930583e29acfed98006856f7d60e784d603