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

Crash fix

Browse Source
This commit is contained in:
Anuken
2019-09-25 12:17:08 -04:00
parent 9ba11e2474
commit 5edf70103f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/ai/BlockIndexer.java
View File

@@ -143,8 +143,11 @@ public class BlockIndexer{
returnArray.clear(); returnArray.clear();
for(Team enemy : state.teams.enemiesOf(team)){ for(Team enemy : state.teams.enemiesOf(team)){
if(state.teams.isActive(enemy)){ if(state.teams.isActive(enemy)){
for(Tile tile : getFlagged(enemy)[type.ordinal()]){ ObjectSet<Tile> set = getFlagged(enemy)[type.ordinal()];
returnArray.add(tile); if(set != null){
for(Tile tile : set){
returnArray.add(tile);
}
} }
} }
} }

5
core/src/io/anuke/mindustry/editor/MapRenderer.java
View File

@@ -68,6 +68,11 @@ public class MapRenderer implements Disposable{
updates.addAll(delayedUpdates); updates.addAll(delayedUpdates);
delayedUpdates.clear(); delayedUpdates.clear();
//????
if(chunks == null){
return;
}
for(int x = 0; x < chunks.length; x++){ for(int x = 0; x < chunks.length; x++){
for(int y = 0; y < chunks[0].length; y++){ for(int y = 0; y < chunks[0].length; y++){
IndexedRenderer mesh = chunks[x][y]; IndexedRenderer mesh = chunks[x][y];