From 0ab4f01d5d47e92331cd27e80ad690d8dd19f0d9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 4 Jan 2021 11:20:01 -0500 Subject: [PATCH] Better suicide bomb trigger check --- core/src/mindustry/entities/comp/UnitComp.java | 4 +++- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 81a604e455..bce58a2c9d 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -46,6 +46,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I transient Seq abilities = new Seq<>(0); private transient float resupplyTime = Mathf.random(10f); + private transient boolean wasPlayer; public void moveAt(Vec2 vector){ moveAt(vector, type.accel); @@ -423,7 +424,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I Events.fire(new UnitDestroyEvent(self())); - if(explosiveness > 7f && isLocal()){ + if(explosiveness > 7f && (isLocal() || wasPlayer)){ Events.fire(Trigger.suicideBomb); } @@ -481,6 +482,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I @Override public void killed(){ + wasPlayer = isLocal(); health = 0; dead = true; diff --git a/gradle.properties b/gradle.properties index 067e8595ff..f42373473e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=5e9176c3feefa5ee2f14b08f82da1f01f790e64a \ No newline at end of file +archash=5e9176c3feefa5ee2f14b08f82da1f01f790e64a