From 8654f25a4f6459abe0ab3aea0f4ff52cdcd4a955 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 3 Sep 2018 13:48:16 -0400 Subject: [PATCH] Bugfixes for GWT --- build.gradle | 2 +- core/src/io/anuke/mindustry/content/Mechs.java | 2 +- .../src/io/anuke/mindustry/entities/units/types/Drone.java | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 92b783b925..cce55f263b 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' roboVMVersion = '2.3.0' - uCoreVersion = 'f311d4683c798c2b0e5967938edb7a52a1294119' + uCoreVersion = '64ec4a15148b27749ca7b505dea9743add9902f2' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 9602e47455..4e3d628a56 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -137,7 +137,7 @@ public class Mechs implements ContentList{ boostSpeed = 0.8f; weapon = Weapons.healBlaster; maxSpeed = 5f; - armor = 20f; + armor = 15f; altChargeAlpha = 0.05f; trailColorTo = Palette.heal; } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java index b161693312..9525630b92 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java @@ -18,6 +18,7 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemStack; +import io.anuke.mindustry.type.ItemType; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; @@ -220,6 +221,12 @@ public class Drone extends FlyingUnit implements BuilderTrait{ return; } + if(inventory.getItem().item.type != ItemType.material){ + inventory.clearItem(); + setState(mine); + return; + } + target = getClosestCore(); if(target == null) return;