Merge remote-tracking branch 'origin/master'
|
Before Width: | Height: | Size: 570 B After Width: | Height: | Size: 611 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 543 B After Width: | Height: | Size: 572 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1013 B After Width: | Height: | Size: 1012 B |
|
Before Width: | Height: | Size: 536 B After Width: | Height: | Size: 542 B |
|
Before Width: | Height: | Size: 416 B After Width: | Height: | Size: 416 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 463 B After Width: | Height: | Size: 463 B |
@@ -85,6 +85,10 @@ public class BlockRenderer{
|
|||||||
updateFloors.add(new UpdateRenderState(tile, tile.floor()));
|
updateFloors.add(new UpdateRenderState(tile, tile.floor()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(tile.overlay().updateRender(tile)){
|
||||||
|
updateFloors.add(new UpdateRenderState(tile, tile.overlay()));
|
||||||
|
}
|
||||||
|
|
||||||
if(tile.build != null && (tile.team() == player.team() || !state.rules.fog || (tile.build.visibleFlags & (1L << player.team().id)) != 0)){
|
if(tile.build != null && (tile.team() == player.team() || !state.rules.fog || (tile.build.visibleFlags & (1L << player.team().id)) != 0)){
|
||||||
tile.build.wasVisible = true;
|
tile.build.wasVisible = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -174,6 +174,6 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Realm of Serene Lime",
|
"name": "Realm of Serene Lime",
|
||||||
"address": ["43.248.185.167:8517"]
|
"address": ["43.248.185.167:8517","n2.akiracloud.net:10686"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||