diff --git a/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java b/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java
index 381b2e2..12dbf85 100644
--- a/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java
+++ b/src/de/miaurizius/jgame2d/core/handlers/EventHandler.java
@@ -88,6 +88,7 @@ public class EventHandler {
         panel.player.solidArea.y = panel.player.solidAreaDefaultY;
         eventRect[map.getIndex()][eventCol][eventRow].x = eventRect[map.getIndex()][eventCol][eventRow].eventRectDefaultX;
         eventRect[map.getIndex()][eventCol][eventRow].y = eventRect[map.getIndex()][eventCol][eventRow].eventRectDefaultY;
+        if(panel.currentMap != map) hit = false;
         return hit;
     }
 
diff --git a/src/de/miaurizius/jgame2d/entity/Player.java b/src/de/miaurizius/jgame2d/entity/Player.java
index 718a4a7..6c803e8 100644
--- a/src/de/miaurizius/jgame2d/entity/Player.java
+++ b/src/de/miaurizius/jgame2d/entity/Player.java
@@ -294,9 +294,9 @@ public class Player extends Entity {
         worldX = panel.tileSize * 23;
         worldY = panel.tileSize * 21;
 
-        worldX = panel.tileSize * 12;
-        worldY = panel.tileSize * 12;
-        panel.currentMap = Map.HUT;
+//        worldX = panel.tileSize * 12;
+//        worldY = panel.tileSize * 12;
+//        panel.currentMap = Map.HUT;
 
         speed = 4;
         direction = Direction.DOWN;
@@ -309,7 +309,7 @@ public class Player extends Entity {
         dexterity = 1;
         exp = 0;
         nextLevelExp = 5;
-        coins = 500;
+        coins = 0;
         currentWeapon = new SwordNormalObj(panel);
         currentShield = new ShieldWoodObj(panel);
         projectile = new FireballObj(panel);