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

Synchronized tile modification with updating

Browse Source
This commit is contained in:
Anuken
2018-02-17 16:04:09 -05:00
parent 30d0d7715a
commit a79dfe29ef
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sat Feb 17 13:59:09 EST 2018 #Sat Feb 17 14:39:13 EST 2018
version=beta version=beta
androidBuildCode=235 androidBuildCode=235
name=Mindustry name=Mindustry
code=3.3 code=3.3
build=23 build=custom build

18
core/src/io/anuke/mindustry/entities/TileEntity.java
View File

@@ -106,17 +106,19 @@ public class TileEntity extends Entity{
@Override @Override
public void update(){ public void update(){
if(health != 0 && health < tile.block().health && !(tile.block() instanceof Wall) && synchronized (tile) {
Mathf.chance(0.009f*Timers.delta()*(1f-health/tile.block().health))){ if (health != 0 && health < tile.block().health && !(tile.block() instanceof Wall) &&
Mathf.chance(0.009f * Timers.delta() * (1f - health / tile.block().health))) {
Effects.effect(Fx.smoke, x+Mathf.range(4), y+Mathf.range(4)); Effects.effect(Fx.smoke, x + Mathf.range(4), y + Mathf.range(4));
} }
if(health <= 0){ if (health <= 0) {
onDeath(); onDeath();
}
tile.block().update(tile);
} }
tile.block().update(tile);
} }
public int totalItems(){ public int totalItems(){

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

@@ -260,18 +260,20 @@ public class Tile{
} }
public void changed(){ public void changed(){
if(entity != null){ synchronized (this) {
entity.remove(); if (entity != null) {
entity = null; entity.remove();
} entity = null;
}
Block block = block();
if(block.destructible || block.update){
entity = block.getEntity().init(this, block.update);
}
updateOcclusion(); Block block = block();
if (block.destructible || block.update) {
entity = block.getEntity().init(this, block.update);
}
updateOcclusion();
}
} }
@Override @Override

1
core/src/io/anuke/mindustry/world/blocks/types/distribution/Conveyor.java
View File

@@ -143,7 +143,6 @@ public class Conveyor extends Block{
@Override @Override
public boolean acceptItem(Item item, Tile tile, Tile source){ public boolean acceptItem(Item item, Tile tile, Tile source){
if(tile.entity == null) return false;
int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.getRotation()); int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.getRotation());
float minitem = tile.<ConveyorEntity>entity().minitem; float minitem = tile.<ConveyorEntity>entity().minitem;
return (((direction == 0) && minitem > 0.05f) || return (((direction == 0) && minitem > 0.05f) ||