diff --git a/.gitignore b/.gitignore
index fcf9215..eedce7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 .classpath
 .project
 *.log
+/.idea/
+/out/
+/Zoelda.iml
diff --git a/Zoelda/src/main/entities/Entity.java b/Zoelda/src/main/entities/Entity.java
index 719ed11..1e55521 100644
--- a/Zoelda/src/main/entities/Entity.java
+++ b/Zoelda/src/main/entities/Entity.java
@@ -138,4 +138,35 @@ public abstract class Entity implements Ticker {
 		return clear;
 	}
 
+	/**
+	 * Gibt den velX Wert zurück.
+	 * @return gibt den velX Wert als float zurück.
+	 */
+	public float getVelX() {
+		return velX;
+	}
+
+	/**
+	 * Gibt den velY Wert zurück.
+	 * @return gibt den velY Wert als float zurück.
+	 */
+	public float getVelY() {
+		return velY;
+	}
+
+	/**
+	 * Setzt eine neue velX velocity.
+	 * @param velX neuer float velX Wert.
+	 */
+	public void setVelX(float velX) {
+		this.velX = velX;
+	}
+
+	/**
+	 * Setzt eine neue Y velocity.
+	 * @param velY neuer float velY Wert.
+	 */
+	public void setVelY(float velY) {
+		this.velY = velY;
+	}
 }
diff --git a/Zoelda/src/main/entities/Player.java b/Zoelda/src/main/entities/player/Player.java
similarity index 82%
rename from Zoelda/src/main/entities/Player.java
rename to Zoelda/src/main/entities/player/Player.java
index 2547d18..1dc4280 100644
--- a/Zoelda/src/main/entities/Player.java
+++ b/Zoelda/src/main/entities/player/Player.java
@@ -1,11 +1,13 @@
-package main.entities;
-
-import java.util.ArrayList;
+package main.entities.player;
 
 import ea.Taste;
 import ea.Vektor;
 import main.Main;
 import main.SheetLoader;
+import main.entities.Entity;
+import main.entities.LivingEntity;
+
+import java.util.ArrayList;
 
 public class Player extends LivingEntity {
 
@@ -76,8 +78,19 @@ public class Player extends LivingEntity {
 				if (Main.instance.tasteGedrueckt(Taste.F)) {
 					zustandSetzen("die");
 				}
+				
+				if (actionFigur.aktuellesVerhalten().equals("swipe") && actionFigur.aktuelleFigur().aktuellesBild() == 1) {
+					ArrayList<Entity> entities = Main.instance.getWorld().getCurrentMap().getEntities();
+					for (Entity e : entities) {
+						if (e instanceof LivingEntity) {
+							((LivingEntity) e).takeDamage(0.1f);
+						}
+					}
+				}
 			}
 			
+			// auf Kollisionen prüfen
+			checkTileCollisions(Main.instance.getWorld().getCurrentMap());
 			// LivingEntity auch updaten lassen
 			super.update();
 		} else {
@@ -95,8 +108,8 @@ public class Player extends LivingEntity {
 					LivingEntity le = (LivingEntity) e;
 					Vektor toE = vectorToEntity(le);
 					toE = toE.normiert();
-					le.velX += toE.x * 0.05f;
-					le.velY += toE.y * 0.05f;
+					le.setVelX(le.getVelX()+toE.x * 0.05f);
+					le.setVelY(le.getVelY()+toE.x * 0.05f);
 					le.takeDamage(0.1f);
 				}
 			}