Fixed bugs with multiplayer on Android and new place modes

2018-01-16 17:22:35 -05:00
parent 6211afb904
commit 7827ab4267
9 changed files with 18 additions and 13 deletions
--- a/core/src/io/anuke/mindustry/entities/effect/DamageArea.java
+++ b/core/src/io/anuke/mindustry/entities/effect/DamageArea.java
@@ -60,7 +60,7 @@ public class DamageArea{
        };

 		Entities.getNearby(Vars.control.enemyGroup, rect, cons);
-        Entities.getNearby(Vars.control.playerGroup, rect, cons);
+        if(!Vars.control.isFriendlyFire()) Entities.getNearby(Vars.control.playerGroup, rect, cons);
 	}
 	
 	public static void damageEntities(float x, float y, float radius, int damage){