Fixed #8849
This commit is contained in:
@@ -115,6 +115,12 @@ public class GameService{
|
|||||||
installMod.complete();
|
installMod.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Events.on(ClientLoadEvent.class, e -> {
|
||||||
|
if(mods.list().size > 0){
|
||||||
|
installMod.complete();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
if(Core.bundle.get("yes").equals("router")){
|
if(Core.bundle.get("yes").equals("router")){
|
||||||
routerLanguage.complete();
|
routerLanguage.complete();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -233,7 +233,8 @@ public class Floor extends Block{
|
|||||||
for(int i = 0; i < 8; i++){
|
for(int i = 0; i < 8; i++){
|
||||||
Point2 point = Geometry.d8[i];
|
Point2 point = Geometry.d8[i];
|
||||||
Tile other = tile.nearby(point);
|
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)){
|
if(!blended.getAndSet(other.floor().id)){
|
||||||
blenders.add(other.floor());
|
blenders.add(other.floor());
|
||||||
dirs[i] = other.floorID();
|
dirs[i] = other.floorID();
|
||||||
@@ -305,8 +306,9 @@ public class Floor extends Block{
|
|||||||
return ((Floor)blendGroup).edges;
|
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){
|
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){
|
TextureRegion edge(Floor block, int x, int y){
|
||||||
|
|||||||
Reference in New Issue
Block a user