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

Fixed mod startup crash

Browse Source
This commit is contained in:
Anuken
2023-05-22 21:42:46 -04:00
parent c4b1df9526
commit 871548c095
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/ContentLoader.java
View File

@@ -33,7 +33,7 @@ public class ContentLoader{
public ContentLoader(){ public ContentLoader(){
for(ContentType type : ContentType.all){ for(ContentType type : ContentType.all){
contentMap[type.ordinal()] = new Seq<>(type.contentClass == null ? Object.class : type.contentClass); contentMap[type.ordinal()] = new Seq<>();
contentNameMap[type.ordinal()] = new ObjectMap<>(); contentNameMap[type.ordinal()] = new ObjectMap<>();
} }
} }

4
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1005,7 +1005,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
int dump = this.cdump; int dump = this.cdump;
var allItems = content.items(); var allItems = content.items();
int itemSize = allItems.size; int itemSize = allItems.size;
Item[] itemArray = allItems.items; Object[] itemArray = allItems.items;
for(int i = 0; i < proximity.size; i++){ for(int i = 0; i < proximity.size; i++){
Building other = proximity.get((i + dump) % proximity.size); Building other = proximity.get((i + dump) % proximity.size);
@@ -1014,7 +1014,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
for(int ii = 0; ii < itemSize; ii++){ for(int ii = 0; ii < itemSize; ii++){
if(!items.has(ii)) continue; if(!items.has(ii)) continue;
Item item = itemArray[ii]; Item item = (Item)itemArray[ii];
if(other.acceptItem(self(), item) && canDump(other, item)){ if(other.acceptItem(self(), item) && canDump(other, item)){
other.handleItem(self(), item); other.handleItem(self(), item);