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

More empty floor bugfixes

Browse Source
This commit is contained in:
Anuken
2023-07-29 12:10:27 -04:00
parent 6678729401
commit 07c7fd7dec
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/shaders/water.frag
View File

@@ -20,7 +20,6 @@ void main(){
float stime = u_time / 5.0; float stime = u_time / 5.0;
vec4 sampled = texture2D(u_texture, c + vec2(sin(stime/3.0 + coords.y/0.75) * v.x, 0.0)); vec4 sampled = texture2D(u_texture, c + vec2(sin(stime/3.0 + coords.y/0.75) * v.x, 0.0));
vec3 color = sampled.rgb * vec3(0.9, 0.9, 1); vec3 color = sampled.rgb * vec3(0.9, 0.9, 1);
float tester = mod((coords.x + coords.y*1.1 + sin(stime / 8.0 + coords.x/5.0 - coords.y/100.0)*2.0) + float tester = mod((coords.x + coords.y*1.1 + sin(stime / 8.0 + coords.x/5.0 - coords.y/100.0)*2.0) +

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

@@ -255,7 +255,7 @@ public class Floor extends Block{
Point2 point = Geometry.d8[i]; Point2 point = Geometry.d8[i];
Tile other = tile.nearby(point); Tile other = tile.nearby(point);
if(other != null && doEdge(tile, other, other.floor()) && other.floor().cacheLayer == realCache && other.floor().edges() != null){ if(other != null && doEdge(tile, other, other.floor()) && other.floor().cacheLayer == realCache && 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());