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

Fixed editor placing blocks at 0 health

Browse Source
This commit is contained in:
Anuken
2019-03-12 14:57:10 -04:00
parent e7b51f313b
commit 0c75f920de
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -367,7 +367,7 @@ category.general = General
category.power = Power category.power = Power
category.liquids = Liquids category.liquids = Liquids
category.items = Items category.items = Items
category.crafting = Crafting category.crafting = Input/Output
category.shooting = Shooting category.shooting = Shooting
category.optional = Optional Enhancements category.optional = Optional Enhancements
setting.animatedwater.name = Animated Water setting.animatedwater.name = Animated Water

1
core/src/io/anuke/mindustry/editor/EditorTile.java
View File

@@ -92,6 +92,7 @@ public class EditorTile extends Tile{
if(block.hasEntity()){ if(block.hasEntity()){
entity = block.newEntity(); entity = block.newEntity();
entity.health = block.health;
entity.cons = new ConsumeModule(entity); entity.cons = new ConsumeModule(entity);
if(block.hasItems) entity.items = new ItemModule(); if(block.hasItems) entity.items = new ItemModule();
if(block.hasLiquids) entity.liquids = new LiquidModule(); if(block.hasLiquids) entity.liquids = new LiquidModule();

2
core/src/io/anuke/mindustry/editor/MapEditor.java
View File

@@ -3,7 +3,6 @@ package io.anuke.mindustry.editor;
import io.anuke.arc.collection.ObjectMap; import io.anuke.arc.collection.ObjectMap;
import io.anuke.arc.files.FileHandle; import io.anuke.arc.files.FileHandle;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.arc.util.Log;
import io.anuke.arc.util.Pack; import io.anuke.arc.util.Pack;
import io.anuke.arc.util.Structs; import io.anuke.arc.util.Structs;
import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Blocks;
@@ -210,7 +209,6 @@ public class MapEditor{
if(!isfloor){ if(!isfloor){
byte link = tile.getLinkByte(); byte link = tile.getLinkByte();
Log.info("Remove linkd: " + tiles[x][y]);
if(tile.block().isMultiblock()){ if(tile.block().isMultiblock()){
removeLinked(wx, wy); removeLinked(wx, wy);