mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #8849

Browse Source
This commit is contained in:
Anuken 2023-07-27 15:48:32 -04:00
parent dae23c7fe6
commit 69377bab3f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/service/GameService.java
View File

@ -115,6 +115,12 @@ public class GameService{
installMod.complete();
}
Events.on(ClientLoadEvent.class, e -> {
if(mods.list().size > 0){
installMod.complete();
}
});
if(Core.bundle.get("yes").equals("router")){
routerLanguage.complete();
}

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

@ -233,7 +233,8 @@ public class Floor extends Block{
for(int i = 0; i < 8; i++){
Point2 point = Geometry.d8[i];
Tile other = tile.nearby(point);
if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null){
//special case: empty is, well, empty, so never draw emptyness on top, as that would just be an incorrect black texture
if(other != null && other.floor().cacheLayer == layer && other.floor().edges() != null && other.floor() != Blocks.empty){
if(!blended.getAndSet(other.floor().id)){
blenders.add(other.floor());
dirs[i] = other.floorID();
@ -305,8 +306,9 @@ public class Floor extends Block{
return ((Floor)blendGroup).edges;
}
/** @return whether the edges from {@param other} should be drawn onto this tile **/
protected boolean doEdge(Tile tile, Tile otherTile, Floor other){
return other.realBlendId(otherTile) > realBlendId(tile) || edges() == null;
return (other.realBlendId(otherTile) > realBlendId(tile) || edges() == null);
}
TextureRegion edge(Floor block, int x, int y){