Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash on version 1.20 #77

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix crash on version 1.20 #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 23 additions & 27 deletions src/main/java/com/kovuthehusky/dynmap/structures/DynmapStructuresPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,35 +526,14 @@ public void onEnable() {
}
}
// Add bastion remnant if supported
if (StructureType.getStructureTypes().containsKey("bastion_remnant")) {
for (Biome biome : new Biome[]{NETHER_WASTES, SOUL_SAND_VALLEY, CRIMSON_FOREST, WARPED_FOREST}) {
StructureType[] temp = new StructureType[BIOMES[biome.ordinal()].length + 1];
System.arraycopy(BIOMES[biome.ordinal()], 0, temp, 0, BIOMES[biome.ordinal()].length);
temp[temp.length - 1] = BASTION_REMNANT;
BIOMES[biome.ordinal()] = temp;
}
}
registerStructure("bastion_remnant", BASTION_REMNANT, new Biome[]{NETHER_WASTES, SOUL_SAND_VALLEY, CRIMSON_FOREST, WARPED_FOREST});

// Add nether fossils if supported
if (StructureType.getStructureTypes().containsKey("nether_fossil")) {
for (Biome biome : new Biome[]{SOUL_SAND_VALLEY}) {
StructureType[] temp = new StructureType[BIOMES[biome.ordinal()].length + 1];
System.arraycopy(BIOMES[biome.ordinal()], 0, temp, 0, BIOMES[biome.ordinal()].length);
temp[temp.length - 1] = NETHER_FOSSIL;
BIOMES[biome.ordinal()] = temp;
}
}
registerStructure("nether_fossil", NETHER_FOSSIL, new Biome[]{SOUL_SAND_VALLEY});

// Add ruined portals if supported
if (StructureType.getStructureTypes().containsKey("ruined_portal")) {
for (Biome biome : Biome.values()) {
if (biome == THE_END) {
continue;
}
StructureType[] temp = new StructureType[BIOMES[biome.ordinal()].length + 1];
System.arraycopy(BIOMES[biome.ordinal()], 0, temp, 0, BIOMES[biome.ordinal()].length);
temp[temp.length - 1] = RUINED_PORTAL;
BIOMES[biome.ordinal()] = temp;
}
}
registerStructure("ruined_portal", RUINED_PORTAL, Biome.values());

// Add ancient cities if supported
// if (StructureType.getStructureTypes().containsKey("ancient_city")) {
// ArrayList<Biome> biomes = new ArrayList<Biome>() {{
Expand Down Expand Up @@ -640,6 +619,23 @@ public void onEnable() {
}
}

private void registerStructure(String structureKey, StructureType structureType, Biome[] biomes) {
if (StructureType.getStructureTypes().containsKey(structureKey)) {
for (Biome biome : biomes) {
StructureType[] oldStructures = BIOMES[biome.ordinal()];
if (oldStructures == null) {
BIOMES[biome.ordinal()] = new StructureType[]{structureType};
} else {
StructureType[] newStructures = new StructureType[oldStructures.length + 1];
System.arraycopy(oldStructures, 0, newStructures, 0, oldStructures.length);
newStructures[newStructures.length - 1] = structureType;
BIOMES[biome.ordinal()] = newStructures;
}
}

}
}

@EventHandler
public void onChunkLoad(ChunkLoadEvent event) {
if (event.getWorld().canGenerateStructures()) {
Expand Down