Fix more bugs

2017-12-13 01:42:15 -05:00
parent 5c1d7a146b
commit ece7ad0fd3
6 changed files with 39 additions and 11 deletions
--- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
@@ -66,9 +66,7 @@ public class Enemy extends DestructibleEntity{
 		Tile core = Vars.control.getCore();
 		
 		if(idletime > maxIdleLife){
-			Effects.effect(Fx.shellsmoke, this);
-			Effects.effect(Fx.explosion, this);
-			remove();
+			onDeath();
 			return;
 		}
 		
@@ -239,7 +237,7 @@ public class Enemy extends DestructibleEntity{
 		
 		float minv = 0.08f;
 		
-		if(xvelocity < minv && yvelocity < minv && node > 0){
+		if(xvelocity < minv && yvelocity < minv && node > 0 && target == null){
 			idletime += Timers.delta();
 		}else{
 			idletime = 0;