This commit is contained in:
Anuken
2018-12-02 16:56:44 -05:00
parent 5afb5d24d8
commit e33c863162
7 changed files with 17 additions and 5 deletions
+1 -1
View File
@@ -133,7 +133,7 @@ text.confirmunban = Are you sure you want to unban this player?
text.confirmadmin = Are you sure you want to make this player an admin? text.confirmadmin = Are you sure you want to make this player an admin?
text.confirmunadmin = Are you sure you want to remove admin status from this player? text.confirmunadmin = Are you sure you want to remove admin status from this player?
text.joingame.title = Join Game text.joingame.title = Join Game
text.joingame.ip = IP: text.joingame.ip = Address:
text.disconnect = Disconnected. text.disconnect = Disconnected.
text.disconnect.data = Failed to load world data! text.disconnect.data = Failed to load world data!
text.connecting = [accent]Connecting... text.connecting = [accent]Connecting...
@@ -86,7 +86,7 @@ public class BlockIndexer{
process(tile); process(tile);
if(tile.entity != null && tile.entity.healthf() < 0.9999f){ if(tile.entity != null && tile.entity.damaged()){
notifyTileDamaged(tile.entity); notifyTileDamaged(tile.entity);
} }
} }
@@ -116,7 +116,7 @@ public class BlockIndexer{
ObjectSet<Tile> set = damagedTiles[team.ordinal()]; ObjectSet<Tile> set = damagedTiles[team.ordinal()];
for(Tile tile : set){ for(Tile tile : set){
if(tile.entity == null || tile.entity.getTeam() != team || tile.entity.healthf() >= 0.9999f){ if(tile.entity == null || tile.entity.getTeam() != team || !tile.entity.damaged()){
returnArray.add(tile); returnArray.add(tile);
} }
} }
@@ -381,7 +381,7 @@ public class NetServer extends Module{
return; return;
} }
if(other == null || (other.isAdmin && other != player)){ //fun fact: this means you can ban yourself if(other == null || ((other.isAdmin && !player.isLocal) && other != player)){
Log.err("{0} attempted to perform admin action on nonexistant or admin player.", player.name); Log.err("{0} attempted to perform admin action on nonexistant or admin player.", player.name);
return; return;
} }
@@ -154,6 +154,10 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
} }
} }
public boolean damaged(){
return health < maxHealth() - 0.00001f;
}
public Tile getTile(){ public Tile getTile(){
return tile; return tile;
} }
@@ -42,6 +42,13 @@ public abstract class MissionWithStartingCore extends Mission{
startingCoreTile.setBlock(StorageBlocks.core); startingCoreTile.setBlock(StorageBlocks.core);
startingCoreTile.setTeam(team); startingCoreTile.setTeam(team);
state.teams.get(team).cores.add(startingCoreTile); state.teams.get(team).cores.add(startingCoreTile);
//makes sure there's a flat area around core
for(int dx = -2; dx <= 2; dx++){
for(int dy = -2; dy <= 2; dy++){
gen.tiles[startingCoreTile.x + dx][startingCoreTile.y + dy].setElevation(startingCoreTile.getElevation());
}
}
} }
/** /**
@@ -268,6 +268,7 @@ public class JoinDialog extends FloatingDialog{
if(totalHosts == 0){ if(totalHosts == 0){
local.clear(); local.clear();
} }
local.background((Drawable) null);
totalHosts ++; totalHosts ++;
float w = targetWidth(); float w = targetWidth();
@@ -116,7 +116,7 @@ public class PlayerListFragment extends Fragment{
t.row(); t.row();
t.addImageButton("icon-admin", "clear-toggle", 14 * 2, () -> { t.addImageButton("icon-admin", "clear-toggle-partial", 14 * 2, () -> {
if(Net.client()) return; if(Net.client()) return;
String id = player.uuid; String id = player.uuid;