mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-21 12:03:29 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework

Browse source 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Recipes.java
This commit is contained in:
Anuken 2019-01-06 09:45:11 -05:00
commit 307bb7aeec
6 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/io/anuke/mindustry/entities/TileEntity.java
View file

@ -71,7 +71,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
}
/**Sets this tile entity data to this tile, and adds it if necessary.*/
public TileEntity init(Tile tile, boolean added){
public TileEntity init(Tile tile, boolean shouldAdd){
this.tile = tile;
x = tile.drawx();
y = tile.drawy();
@ -80,7 +80,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
timer = new Interval(tile.block().timers);
if(added){
if(shouldAdd){
add();
}