From fa0d89b6df2386f9e15549ba1e7ce867730b8534 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 5 Jul 2018 17:37:24 -0400 Subject: [PATCH] Fixed crash --- core/src/Mindustry.gwt.xml | 1 + core/src/io/anuke/mindustry/entities/TileEntity.java | 4 +++- core/src/io/anuke/mindustry/world/blocks/BuildBlock.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/Mindustry.gwt.xml b/core/src/Mindustry.gwt.xml index c7a38eeb99..7698085253 100644 --- a/core/src/Mindustry.gwt.xml +++ b/core/src/Mindustry.gwt.xml @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java index e53425605f..75a4d1f1e5 100644 --- a/core/src/io/anuke/mindustry/entities/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/TileEntity.java @@ -170,7 +170,9 @@ public class TileEntity extends BaseEntity implements TargetTrait { @Remote(called = Loc.server, in = In.blocks) public static void onTileDamage(Tile tile, float health){ - tile.entity.health = health; + if(tile.entity != null){ + tile.entity.health = health; + } } @Remote(called = Loc.server, in = In.blocks) diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index 31979b1aed..bd0cf5c971 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -213,7 +213,7 @@ public class BuildBlock extends Block { if (amount > 0) { //if it's positive, add it to the core int accepting = core.tile.block().acceptStack(requirements[i].item, accumulated, core.tile, builder); - core.tile.block().handleStack(requirements[i].item, accumulated, core.tile, builder); + core.tile.block().handleStack(requirements[i].item, accepting, core.tile, builder); accumulator[i] -= accepting; }