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

Bugfixes / Testing reaper sprite

Browse Source
This commit is contained in:
Anuken
2020-04-10 12:55:58 -04:00
parent 00f3353976
commit 2395bc9308
9 changed files with 847 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/world/blocks/environment/Floor.java
View File

@@ -231,9 +231,10 @@ public class Floor extends Block{
}
protected boolean doEdge(Floor other, boolean sameLayer){
boolean dir = !((other instanceof ShallowLiquid && ((ShallowLiquid)other).floorBase == this) || (this instanceof ShallowLiquid && ((ShallowLiquid)this).floorBase == other));
return ((other.blendGroup.id > blendGroup.id == dir) || edges() == null) &&
other.edgeOnto(this) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer);
//TODO this is awful and should not exist.
boolean normal = ((other instanceof ShallowLiquid) == (this instanceof ShallowLiquid)) || (cacheLayer == other.cacheLayer);
return (((other.blendGroup.id > blendGroup.id) || edges() == null) &&
other.edgeOnto(this) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer)) == normal;
}
protected boolean edgeOnto(Floor other){