Skip to content

Commit 6e16383

Browse files
committed
Prevent a spawn radius of < 0
1 parent f05d8fd commit 6e16383

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ org.gradle.parallel=true
88
loader_version=0.14.8
99

1010
# Mod Properties
11-
mod_version = 1.0.0
11+
mod_version = 1.0.1
1212
maven_group = io.github.notstirred
1313
archives_base_name = spawnradius
1414

src/main/java/io/github/notstirred/spawnradius/SpawnRadius.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void onInitialize() {
2828

2929
try {
3030
JsonElement parsed = JsonParser.parseReader(new FileReader(configPath.toFile()));
31-
RADIUS = parsed.getAsJsonObject().get("radius").getAsInt();
31+
RADIUS = Math.max(0, parsed.getAsJsonObject().get("radius").getAsInt());
3232
} catch (Throwable t) {
3333
LOGGER.error(String.format("Failed to set config values from file: %s", configPath), t);
3434
}

src/main/java/io/github/notstirred/spawnradius/mixin/MixinMinecraftServer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class MixinMinecraftServer {
1717

1818
@Redirect(method = "prepareStartRegion", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerChunkManager;addTicket(Lnet/minecraft/server/world/ChunkTicketType;Lnet/minecraft/util/math/ChunkPos;ILjava/lang/Object;)V"), require = 1)
1919
private <T> void replaceRegionTicketRadius(ServerChunkManager instance, ChunkTicketType<T> ticketType, ChunkPos pos, int radius, T unit) {
20-
if (SpawnRadius.RADIUS != 0) {
20+
if (SpawnRadius.RADIUS > 0) {
2121
instance.addTicket(ticketType, pos, SpawnRadius.RADIUS, unit);
2222
}
2323
SpawnRadius.LOGGER.info("Replaced SPAWN ticket with radius: " + SpawnRadius.RADIUS);
@@ -31,7 +31,7 @@ private int replaceRequiredChunksCount(int original) {
3131
}
3232

3333
private static int calculateRequiredChunksCount(int radius) {
34-
if (radius == 0) {
34+
if (radius < 0) {
3535
SpawnRadius.LOGGER.info("Replaced required chunks to load with: " + 0);
3636
return 0;
3737
}

0 commit comments

Comments
 (0)