From 564e81e734c6a8d01d8a1b4b0430c18710d5fedd Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 21 May 2023 03:59:08 -0400
Subject: [PATCH] Team#isEnemy is pointless

---
 core/assets-raw/sprites/units/dagger.png  | Bin 531 -> 523 bytes
 core/src/mindustry/entities/Damage.java   |   2 +-
 core/src/mindustry/game/Team.java         |   2 ++
 core/src/mindustry/input/MobileInput.java |   2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/assets-raw/sprites/units/dagger.png b/core/assets-raw/sprites/units/dagger.png
index 2fa4b1464d70c76122a4425adfd7c8f86c8bfde9..784c3c49e1aaaafc781f125a730f82a14a9dd2c4 100644
GIT binary patch
delta 484
zcmV<A0UQ341d9ZaF@MELL_t(&f$f!{P6I&@hKB|WAt_WLDtZa3h6g~<AP^XEXV8Fw
z@CcPB2^cud1AsvwND({$rV3F}fhv#?3`xOo&F${&&g|Y&)A`)q?9TrG&Fn6KAP9mW
z2*T_#r+>(@Oc^IhqKwltbtb&buYX+eql0~8&no-ZoN7Fw#D8<=_z=y2kFb~~<~ftz
zKEBHv8ZCecT5UCz@#|n{tijr8xzU{DdLIp)?S_icd$61k0H6k6%9=4OlHv<=6P$c2
z^#vvFbp~|t9BksLm<_G^237;H#rw?BahX63xWt!BjJ1z1+<Z0@#v$hXc}jTe_5%Gr
z*gX!)SMX;-Ie!yT-vI!-cq$f3R0AA=u}ws;z_c;WK)?T@jJI|=${4%Lb=Ef;==bNR
z5xG{sr5^5j&iURIpsqoicq+!pjbRu#KkJguw{0Uzplc3CJf;n;Kot`qgo+1nw9vFn
zR1ptAoB@uB|EAE8=Q$c@3B0-QSzk*1RytgIbmqGH++9@0t_tjJcSwD#TZogWKo`i3
zh3@IqA}6O^v=Z(1nopVu`kPbW)4JY09?L`w@c;n^0IHjaB_1Hq06@5jnBoON5ClOG
aW}RO_f~eo+??+Mq0000<MNUMnLSTaM`Q%Li

delta 492
zcmV<I0Tcd<1d{}iF@McTL_t(&f$fzcPeU;f$BzXJApxck6I+6s;R7I85C{yoXV4D}
zgpV-!Bmo0Y^8vsh5M&5G0A>m?F@YM85X=(5u$R~N+Pn6ZncdH|y<Y$S_Symnf*=Tj
zAj~dvdPkOJO1sr+DeWXloCz=U>mS$nQF>skS!Mm2Q;jE-cz<q;577+x2#aZAo)h%;
zF)lA?lmI4Zt=Ul8uY;j62P>zQdZWnoJ{mg94Hcu;U^yWGKn=c>Ip45Iil3mH;N)9f
zUQoup?tm_ygH1d&W<xuD1FM19;(cOtTqaNhF7f3f#>&SRZa$j{;}Uaro)X@?y+Hd1
zd&fcfCj6OD?tetoe*nNPo*D}!ssWC`*e0T%z_c;$K)?T@w6}LVN*jC2bv8EZX#exm
zh@7jxQV(}MXT0|bP|u)EJT=D2eSX$8K3>BB7Q|hM66lHv`5yo*Cs4&i2%Md_X|k5k
zv`mDQO&RAM;F$PN_IEnP`gxwCG2|sKC!x6d+=>!|k!7YS+RqkubKgV1d+b>~TzW)v
zVB)b7^4T=65;-~Tq9)qyb)Pf^`kw>fU$$QVfGs&Dgd$`PM$jd#dJ;DAA&*AzD-&uW
irg%XR1VIplS?3q3!l}j8_)^RO0000<MNUMnLSTYbO5z;=

diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java
index 4c2106e70b..3b3571df09 100644
--- a/core/src/mindustry/entities/Damage.java
+++ b/core/src/mindustry/entities/Damage.java
@@ -600,7 +600,7 @@ public class Damage{
         for(int dx = -trad; dx <= trad; dx++){
             for(int dy = -trad; dy <= trad; dy++){
                 Tile tile = world.tile(Math.round(x / tilesize) + dx, Math.round(y / tilesize) + dy);
-                if(tile != null && tile.build != null && (team == null ||team.isEnemy(tile.team())) && dx*dx + dy*dy <= trad*trad){
+                if(tile != null && tile.build != null && (team == null || team != tile.team()) && dx*dx + dy*dy <= trad*trad){
                     tile.build.damage(team, damage);
                 }
             }
diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index 9bd6ee89c2..d5673dfdd6 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -121,6 +121,8 @@ public class Team implements Comparable<Team>{
         return isAI() && !rules().rtsAi;
     }
 
+    /** @deprecated There is absolutely no reason to use this. */
+    @Deprecated
     public boolean isEnemy(Team other){
         return this != other;
     }
diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java
index aec370fb38..126032c5e1 100644
--- a/core/src/mindustry/input/MobileInput.java
+++ b/core/src/mindustry/input/MobileInput.java
@@ -96,7 +96,7 @@ public class MobileInput extends InputHandler implements GestureListener{
         }else{
             Building tile = world.buildWorld(x, y);
 
-            if((tile != null && player.team().isEnemy(tile.team) && (tile.team != Team.derelict || state.rules.coreCapture)) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
+            if((tile != null && player.team() != tile.team && (tile.team != Team.derelict || state.rules.coreCapture)) || (tile != null && player.unit().type.canHeal && tile.team == player.team() && tile.damaged())){
                 player.unit().mineTile = null;
                 target = tile;
             }