Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes for GWT

Browse Source
This commit is contained in:
Anuken
2018-09-03 13:48:16 -04:00
parent e877310d85
commit 8654f25a4f
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -26,7 +26,7 @@ allprojects {
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.8' gdxVersion = '1.9.8'
roboVMVersion = '2.3.0' roboVMVersion = '2.3.0'
uCoreVersion = 'f311d4683c798c2b0e5967938edb7a52a1294119' uCoreVersion = '64ec4a15148b27749ca7b505dea9743add9902f2'
getVersionString = { getVersionString = {
String buildVersion = getBuildVersion() String buildVersion = getBuildVersion()

2
core/src/io/anuke/mindustry/content/Mechs.java
View File

@@ -137,7 +137,7 @@ public class Mechs implements ContentList{
boostSpeed = 0.8f; boostSpeed = 0.8f;
weapon = Weapons.healBlaster; weapon = Weapons.healBlaster;
maxSpeed = 5f; maxSpeed = 5f;
armor = 20f; armor = 15f;
altChargeAlpha = 0.05f; altChargeAlpha = 0.05f;
trailColorTo = Palette.heal; trailColorTo = Palette.heal;
} }

7
core/src/io/anuke/mindustry/entities/units/types/Drone.java
View File

@@ -18,6 +18,7 @@ import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.ItemType;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock;
import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity; import io.anuke.mindustry.world.blocks.BuildBlock.BuildEntity;
@@ -220,6 +221,12 @@ public class Drone extends FlyingUnit implements BuilderTrait{
return; return;
} }
if(inventory.getItem().item.type != ItemType.material){
inventory.clearItem();
setState(mine);
return;
}
target = getClosestCore(); target = getClosestCore();
if(target == null) return; if(target == null) return;