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

Functionality fixes

Browse Source
This commit is contained in:
Anuken
2019-12-26 19:48:45 -05:00
parent 4858e602ed a5978b6163
commit d8629100db
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -112,6 +112,8 @@ public class BlockIndexer{
/** Updates all the structure quadrants for a newly activated team. */ /** Updates all the structure quadrants for a newly activated team. */
public void updateTeamIndex(Team team){ public void updateTeamIndex(Team team){
if(structQuadrants == null) return;
//go through every tile... ouch //go through every tile... ouch
for(int x = 0; x < world.width(); x++){ for(int x = 0; x < world.width(); x++){
for(int y = 0; y < world.height(); y++){ for(int y = 0; y < world.height(); y++){

4
core/src/mindustry/game/Teams.java
View File

@@ -125,6 +125,10 @@ public class Teams{
} }
private void updateEnemies(){ private void updateEnemies(){
if(!active.contains(get(state.rules.waveTeam))){
active.add(get(state.rules.waveTeam));
}
for(TeamData data : active){ for(TeamData data : active){
data.enemies.clear(); data.enemies.clear();
for(TeamData other : active){ for(TeamData other : active){

1
core/src/mindustry/world/blocks/BuildBlock.java
View File

@@ -337,6 +337,7 @@ public class BuildBlock extends Block{
} }
public void setDeconstruct(Block previous){ public void setDeconstruct(Block previous){
if(previous == null) return;
this.previous = previous; this.previous = previous;
this.progress = 1f; this.progress = 1f;
if(previous.buildCost >= 0.01f){ if(previous.buildCost >= 0.01f){

8
core/src/mindustry/world/blocks/StaticWall.java
View File

@@ -43,9 +43,9 @@ public class StaticWall extends Rock{
boolean eq(int rx, int ry){ boolean eq(int rx, int ry){
return rx < world.width() - 1 && ry < world.height() - 1 return rx < world.width() - 1 && ry < world.height() - 1
&& world.tile(rx + 1, ry).block() == this && world.tile(rx + 1, ry).block() == this
&& world.tile(rx, ry + 1).block() == this && world.tile(rx, ry + 1).block() == this
&& world.tile(rx, ry).block() == this && world.tile(rx, ry).block() == this
&& world.tile(rx + 1, ry + 1).block() == this; && world.tile(rx + 1, ry + 1).block() == this;
} }
} }