From b5258cd809dc84059db851fba55423c2617e3507 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 20 Jan 2020 14:13:20 -0500
Subject: [PATCH] Fixed #1402 / Fixed #1404

---
 core/src/mindustry/entities/effect/RubbleDecal.java | 5 +++++
 core/src/mindustry/input/InputHandler.java          | 2 +-
 core/src/mindustry/mod/Scripts.java                 | 3 ++-
 gradle.properties                                   | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/mindustry/entities/effect/RubbleDecal.java b/core/src/mindustry/entities/effect/RubbleDecal.java
index 1d26980dc0..a7f7d2a323 100644
--- a/core/src/mindustry/entities/effect/RubbleDecal.java
+++ b/core/src/mindustry/entities/effect/RubbleDecal.java
@@ -38,4 +38,9 @@ public class RubbleDecal extends Decal{
         }
         Draw.rect(region, x, y, Mathf.randomSeed(id, 0, 4) * 90);
     }
+
+    @Override
+    public float drawSize(){
+        return region.getWidth() * 3f;
+    }
 }
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 8000fc4e19..3603d2f957 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -704,7 +704,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     }
 
     public void add(){
-        Core.input.addProcessor(detector = new GestureDetector(20, 0.5f, 0.4f, 0.15f, this));
+        Core.input.addProcessor(detector = new GestureDetector(20, 0.5f, 0.3f, 0.15f, this));
         Core.input.addProcessor(this);
         if(Core.scene != null){
             Table table = (Table)Core.scene.find("inputTable");
diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java
index 1ba32b2e1e..075469f24f 100644
--- a/core/src/mindustry/mod/Scripts.java
+++ b/core/src/mindustry/mod/Scripts.java
@@ -11,7 +11,8 @@ import org.mozilla.javascript.*;
 
 public class Scripts implements Disposable{
     private final Array<String> blacklist = Array.with("net", "files", "reflect", "javax", "rhino", "file", "channels", "jdk",
-        "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system", ".awt", "socket");
+        "runtime", "util.os", "rmi", "security", "org.", "sun.", "beans", "sql", "http", "exec", "compiler", "process", "system",
+        ".awt", "socket", "mod.scripts", "classloader");
     private final Array<String> whitelist = Array.with("mindustry.net");
     private final Context context;
     private final String wrapper;
diff --git a/gradle.properties b/gradle.properties
index 6009dee878..daa72c1573 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=43de3406deffdbeca22a2ff320362cd0129e2da6
+archash=85e020b1565d7f6490d2281411b810916046e5ee