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

Fixed outstanding block type crashes

Browse Source
This commit is contained in:
Anuken
2018-03-08 16:59:39 -05:00
parent c611066791
commit d3313d6438
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/version.properties
View File

@@ -1,5 +1,5 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Wed Mar 07 22:53:33 EST 2018 #Thu Mar 08 16:59:18 EST 2018
version=release version=release
androidBuildCode=407 androidBuildCode=407
name=Mindustry name=Mindustry

6
core/src/io/anuke/mindustry/world/Tile.java
View File

@@ -6,6 +6,9 @@ import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.reflect.ClassReflection; import com.badlogic.gdx.utils.reflect.ClassReflection;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.world.blocks.Blocks; import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.types.modules.InventoryModule;
import io.anuke.mindustry.world.blocks.types.modules.LiquidModule;
import io.anuke.mindustry.world.blocks.types.modules.PowerModule;
import io.anuke.ucore.function.Consumer; import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.util.Bits; import io.anuke.ucore.util.Bits;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
@@ -296,6 +299,9 @@ public class Tile{
if (block.destructible || block.update) { if (block.destructible || block.update) {
entity = block.getEntity().init(this, block.update); entity = block.getEntity().init(this, block.update);
if(block.hasInventory) entity.inventory = new InventoryModule();
if(block.hasLiquids) entity.liquid = new LiquidModule();
if(block.hasPower) entity.power = new PowerModule();
} }
updateOcclusion(); updateOcclusion();

2
core/src/io/anuke/mindustry/world/blocks/BaseBlock.java
View File

@@ -9,8 +9,8 @@ import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
public abstract class BaseBlock { public abstract class BaseBlock {
public boolean hasInventory = true;
public boolean hasLiquids; public boolean hasLiquids;
public boolean hasInventory;
public boolean hasPower; public boolean hasPower;
public int itemCapacity; public int itemCapacity;