From 7dd7ccf69831b7a05d7f9a8d88335f4a4a26d4ff Mon Sep 17 00:00:00 2001
From: iczero <iczero4@gmail.com>
Date: Wed, 4 Dec 2019 20:05:01 -0500
Subject: [PATCH 1/3] Add gradle property jvmArgs (#1161)

Allows specifying additional arguments for the vm, which would
make using tools such as HotSwapAgent and dcevm easier
Example: run -PjvmArgs='["-XXaltjvm=dcevm"]'
---
 desktop/build.gradle | 4 ++++
 server/build.gradle  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/desktop/build.gradle b/desktop/build.gradle
index c9bc28a869..acf5e0ae79 100644
--- a/desktop/build.gradle
+++ b/desktop/build.gradle
@@ -28,6 +28,10 @@ task run(dependsOn: classes, type: JavaExec){
         args Eval.me(project.getProperties()["args"])
     }
 
+    if(project.hasProperty("jvmArgs")){
+        jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
+    }
+
     if(args.contains("debug")){
         main = "io.anuke.mindustry.DebugLauncher"
     }
diff --git a/server/build.gradle b/server/build.gradle
index 26fe08a653..31f6d57dc5 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -19,6 +19,9 @@ task run(dependsOn: classes, type: JavaExec){
     if(project.hasProperty("appArgs")){
         args Eval.me(appArgs)
     }
+    if(project.hasProperty("jvmArgs")){
+        jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
+    }
 }
 
 task debug(dependsOn: classes, type: JavaExec){

From 2e315e55161fbcce9c3d09b460651d72f9c8418a Mon Sep 17 00:00:00 2001
From: iczero <iczero4@gmail.com>
Date: Wed, 4 Dec 2019 21:54:50 -0500
Subject: [PATCH 2/3] Fix builderID remaining -1 for Call.onDeconstructFinish
 (#1162)

BuildEntity.deconstruct is missing code to set builderID,
so the builderID parameter is always set to -1 in
Call.onDeconstructFinish. The same code exists in
BuildEntity.construct.
---
 core/src/io/anuke/mindustry/world/blocks/BuildBlock.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 45023deac8..9a31172660 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -280,6 +280,10 @@ public class BuildBlock extends Block{
 
             progress = Mathf.clamp(progress - amount);
 
+            if(builder instanceof Player){
+                builderID = builder.getID();
+            }
+
             if(progress <= 0 || state.rules.infiniteResources){
                 Call.onDeconstructFinish(tile, this.cblock == null ? previous : this.cblock, builderID);
             }

From db5bd7eea8f5080923fb2efa1f52039303f27c1f Mon Sep 17 00:00:00 2001
From: Ali-C-Ila <56729449+Ali-C-Ila@users.noreply.github.com>
Date: Thu, 5 Dec 2019 23:01:47 +0800
Subject: [PATCH 3/3] Update bundle.properties (#1164)

---
 core/assets/bundles/bundle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 26d75701c6..db800194f3 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -728,7 +728,7 @@ mode.editor.name = Editor
 mode.pvp.name = PvP
 mode.pvp.description = Fight against other players locally.\n[gray]Requires at least 2 differently-colored cores in the map to play.
 mode.attack.name = Attack
-mode.attack.description = Destroy the enemy's base. No waves.\n[gray]Requires a red core in the map to play.
+mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
 mode.custom = Custom Rules
 
 rules.infiniteresources = Infinite Resources