Skip to content

Commit 1ff87cc

Browse files
committed
2.3.1 compatibility
1 parent 252fe35 commit 1ff87cc

File tree

12 files changed

+960
-906
lines changed

12 files changed

+960
-906
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
<!-- Non-minecraft related dependencies -->
5959
<powermock.version>2.0.9</powermock.version>
6060
<!-- More visible way how to change dependency versions -->
61-
<spigot.version>1.20.4-R0.1-SNAPSHOT</spigot.version>
62-
<bentobox.version>2.5.0-SNAPSHOT</bentobox.version>
61+
<spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
62+
<bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
6363
<level.version>2.6.2</level.version>
6464
<bank.version>1.3.0</bank.version>
6565
<!-- Revision variable removes warning about dynamic version -->

src/main/java/world/bentobox/aoneblock/Settings.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import org.bukkit.block.Biome;
1515
import org.bukkit.entity.EntityType;
1616

17-
import com.google.common.base.Enums;
18-
1917
import world.bentobox.aoneblock.listeners.BlockListener;
2018
import world.bentobox.bentobox.BentoBox;
2119
import world.bentobox.bentobox.api.configuration.ConfigComment;
@@ -232,13 +230,13 @@ public class Settings implements WorldSettings {
232230

233231
@ConfigComment("The default biome for the overworld")
234232
@ConfigEntry(path = "world.default-biome")
235-
private Biome defaultBiome = Biome.PLAINS;
233+
private Biome defaultBiome;
236234
@ConfigComment("The default biome for the nether world (this may affect what mobs can spawn)")
237235
@ConfigEntry(path = "world.default-nether-biome")
238-
private Biome defaultNetherBiome = Enums.getIfPresent(Biome.class, "NETHER").or(Enums.getIfPresent(Biome.class, "NETHER_WASTES").or(Biome.BADLANDS));
236+
private Biome defaultNetherBiome;
239237
@ConfigComment("The default biome for the end world (this may affect what mobs can spawn)")
240238
@ConfigEntry(path = "world.default-end-biome")
241-
private Biome defaultEndBiome = Biome.THE_END;
239+
private Biome defaultEndBiome;
242240

243241
@ConfigComment("The maximum number of players a player can ban at any one time in this game mode.")
244242
@ConfigComment("The permission acidisland.ban.maxlimit.X where X is a number can also be used per player")
@@ -1446,7 +1444,7 @@ public boolean isWaterUnsafe() {
14461444
* @return default biome
14471445
*/
14481446
public Biome getDefaultBiome() {
1449-
return defaultBiome;
1447+
return defaultBiome == null ? Biome.PLAINS : defaultBiome;
14501448
}
14511449

14521450
/**
@@ -1891,7 +1889,7 @@ public void setDropOnTop(boolean dropOnTop) {
18911889
* @return the defaultNetherBiome
18921890
*/
18931891
public Biome getDefaultNetherBiome() {
1894-
return defaultNetherBiome;
1892+
return defaultNetherBiome == null ? Biome.NETHER_WASTES : defaultNetherBiome;
18951893
}
18961894

18971895
/**
@@ -1905,7 +1903,7 @@ public void setDefaultNetherBiome(Biome defaultNetherBiome) {
19051903
* @return the defaultEndBiome
19061904
*/
19071905
public Biome getDefaultEndBiome() {
1908-
return defaultEndBiome;
1906+
return defaultEndBiome == null ? Biome.THE_END : defaultEndBiome;
19091907
}
19101908

19111909
/**

src/main/java/world/bentobox/aoneblock/commands/island/IslandRespawnBlockCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ else if (Material.BEDROCK.equals(island.getCenter().getBlock().getType()) ||
8787
for (double x = 0.0; x <= 1.0; x += 0.5) {
8888
for (double y = 0.0; y <= 1.0; y += 0.5) {
8989
for (double z = 0.0; z < 1.0; z += 0.5) {
90-
island.getWorld().spawnParticle(Particle.REDSTONE, island.getCenter().add(new Vector(x, y, z)),
90+
island.getWorld().spawnParticle(Particle.DUST, island.getCenter().add(new Vector(x, y, z)),
9191
5, 0.1, 0, 0.1, 1, new Particle.DustOptions(BlockProtect.GREEN, 1));
9292
}
9393
}

0 commit comments

Comments
 (0)