From 9142da2b70ae6a4769e53c16a62ef0ac695c014b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 29 Jan 2021 12:02:31 -0500
Subject: [PATCH] Stop shooting upon crawler death

---
 core/src/mindustry/entities/EntityCollisions.java | 12 ++++--------
 core/src/mindustry/input/InputHandler.java        |  8 ++++++++
 core/src/mindustry/mod/Scripts.java               |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/src/mindustry/entities/EntityCollisions.java b/core/src/mindustry/entities/EntityCollisions.java
index 3425314810..4787c833e7 100644
--- a/core/src/mindustry/entities/EntityCollisions.java
+++ b/core/src/mindustry/entities/EntityCollisions.java
@@ -190,14 +190,10 @@ public class EntityCollisions{
             yInvExit = y2 - (y1 + h1);
         }
 
-        float xEntry, yEntry;
-        float xExit, yExit;
-
-        xEntry = xInvEntry / vx1;
-        xExit = xInvExit / vx1;
-
-        yEntry = yInvEntry / vy1;
-        yExit = yInvExit / vy1;
+        float xEntry = xInvEntry / vx1;
+        float xExit = xInvExit / vx1;
+        float yEntry = yInvEntry / vy1;
+        float yExit = yInvExit / vy1;
 
         float entryTime = Math.max(xEntry, yEntry);
         float exitTime = Math.min(xExit, yExit);
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 4a5c8fe18b..638353b982 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -68,6 +68,14 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     public Seq<BuildPlan> lineRequests = new Seq<>();
     public Seq<BuildPlan> selectRequests = new Seq<>();
 
+    public InputHandler(){
+        Events.on(UnitDestroyEvent.class, e -> {
+            if(e.unit != null && e.unit.isPlayer() && e.unit.getPlayer().isLocal() && e.unit.type.weapons.contains(w -> w.bullet.killShooter)){
+                player.shooting = false;
+            }
+        });
+    }
+
     //methods to override
 
     @Remote(called = Loc.server, unreliable = true)
diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java
index d1faa3433c..8ef5c8128e 100644
--- a/core/src/mindustry/mod/Scripts.java
+++ b/core/src/mindustry/mod/Scripts.java
@@ -23,7 +23,7 @@ import java.util.regex.*;
 public class Scripts implements Disposable{
     private final Seq<String> blacklist = Seq.with(".net.", "java.net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk",
         "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system",
-        ".awt", "socket", "classloader", "oracle", "invoke", "java.util.function", "java.util.stream", "org.");
+        ".awt", "socket", "classloader", "oracle", "invoke", "java.util.function", "java.util.stream", "org.", "arc.net");
     private final Seq<String> whitelist = Seq.with("mindustry.net", "netserver", "netclient", "com.sun.proxy.$proxy", "mindustry.gen.", "mindustry.logic.", "mindustry.async.", "saveio", "systemcursor");
     private final Context context;
     private final Scriptable scope;