This commit is contained in:
Anuken
2019-09-25 12:12:43 -04:00
parent a1da82a173
commit 9ba11e2474
3 changed files with 19 additions and 11 deletions

View File

@@ -79,6 +79,11 @@ public class NetServer implements ApplicationListener{
con.hasBegunConnecting = true;
con.mobile = packet.mobile;
if(packet.uuid == null || packet.usid == null){
con.kick(KickReason.idInUse);
return;
}
if(admins.isIDBanned(uuid)){
con.kick(KickReason.banned);
return;
@@ -124,7 +129,7 @@ public class NetServer implements ApplicationListener{
return;
}
if(player.uuid.equals(packet.uuid) || player.usid.equals(packet.usid)){
if(player.uuid != null && player.usid != null && (player.uuid.equals(packet.uuid) || player.usid.equals(packet.usid))){
con.kick(KickReason.idInUse);
return;
}

View File

@@ -252,16 +252,6 @@ public class ItemBridge extends Block{
int rel2 = tile.relativeTo(source.x, source.y);
if(rel == rel2) return false;
IntSetIterator it = entity.incoming.iterator();
while(it.hasNext){
int v = it.next();
if(tile.absoluteRelativeTo(Pos.x(v), Pos.y(v)) == rel2){
return false;
}
}
}else{
return source.block() instanceof ItemBridge && source.<ItemBridgeEntity>entity().link == tile.pos() && tile.entity.items.total() < itemCapacity;
}

View File

@@ -52,6 +52,19 @@ public class CommandCenter extends Block{
}
}
@Override
public void removed(Tile tile){
super.removed(tile);
ObjectSet<Tile> set = indexer.getAllied(tile.getTeam(), BlockFlag.comandCenter);
if(set.size == 1){
for(BaseUnit unit : unitGroups[tile.getTeam().ordinal()].all()){
unit.onCommand(UnitCommand.all[0]);
}
}
}
@Override
public void load(){
super.load();