Fixed enemies and players going off-map

Anuken · Jan 23, 2018 · a85357d · a85357d
1 parent 6182aae
commit a85357d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
@@ -186,6 +186,9 @@ public void update(){
 			float angle = Angles.mouseAngle(x, y);
 			this.angle = Mathf.lerpAngDelta(this.angle, angle, 0.1f);
 		}
+
+		x = Mathf.clamp(x, 0, Vars.world.width() * Vars.tilesize);
+		y = Mathf.clamp(y, 0, Vars.world.height() * Vars.tilesize);
 	}
 
 	@Override

diff --git a/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java b/core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
@@ -131,6 +131,9 @@ public void update(Enemy enemy){
         }else{
             enemy.angle = Mathf.slerp(enemy.angle, enemy.angleTo(enemy.target), turretrotatespeed * Timers.delta());
         }
+
+        enemy.x = Mathf.clamp(enemy.x, 0, Vars.world.width() * Vars.tilesize);
+        enemy.y = Mathf.clamp(enemy.y, 0, Vars.world.height() * Vars.tilesize);
     }
 
     public void move(Enemy enemy){