More bugfixes

This commit is contained in:
Anuken
2020-08-18 13:22:06 -04:00
parent 4d83221c76
commit ca864655d1
3 changed files with 7 additions and 2 deletions

View File

@@ -332,6 +332,8 @@ public class NetServer implements ApplicationListener{
Call.sendMessage(Strings.format("[lightgray]A player has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
target.name, votes, votesRequired()));
checkPass();
}
boolean checkPass(){

View File

@@ -10,6 +10,7 @@ import mindustry.entities.*;
import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.blocks.environment.*;
import static mindustry.Vars.*;
@@ -95,7 +96,8 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
}
public boolean onLiquid(){
return floorOn().isLiquid;
Tile tile = tileOn();
return tile != null && tile.floor().isLiquid;
}
}

View File

@@ -16,6 +16,7 @@ import mindustry.logic.LAssembler.*;
import mindustry.logic.LExecutor.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.blocks.BuildBlock.*;
import java.io.*;
import java.util.zip.*;
@@ -380,7 +381,7 @@ public class LogicBlock extends Block{
}
public boolean validLink(Building other){
return other != null && other.isValid() && other.team == team && other.within(this, range + other.block.size*tilesize/2f);
return other != null && other.isValid() && other.team == team && other.within(this, range + other.block.size*tilesize/2f) && !(other instanceof BuildEntity);
}
@Override