diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 7326072..007d472 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -3,5 +3,5 @@ on: [pull_request] jobs: build: - uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-build-pr.yml@claude/implement-release-please-9inVJ + uses: OneLiteFeatherNET/workflows/.github/workflows/gradle-build-pr.yml@v2.1.0 secrets: inherit diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 5da39d9..6b446dd 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -3,11 +3,10 @@ plugins { `java-library` } dependencies { - implementation(platform(libs.mycelium.bom)) implementation(platform(libs.aonyx.bom)) api(libs.minestom) - testImplementation(platform(libs.mycelium.bom)) + testImplementation(platform(libs.aonyx.bom)) testImplementation(libs.junit.api) testImplementation(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.engine) diff --git a/app.json b/app.json index b3300a7..487eada 100644 --- a/app.json +++ b/app.json @@ -7,8 +7,8 @@ }, "allowedSitBlocks": [ { - "domain": "minecraft", - "path": "spruce_stairs" + "namespace": "minecraft", + "value": "spruce_stairs" } ], "simulationDistance": 2, diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 524b06a..48b08dd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,3 +1,5 @@ +import java.nio.file.Files + plugins { java application @@ -6,10 +8,11 @@ plugins { } dependencies { - compileOnly(libs.luckperms.api) + compileOnly(libs.luckperms.api) { + exclude(group = "net.kyori.adventure") + } implementation(project(":api")) implementation(project(":common")) - implementation(platform(libs.mycelium.bom)) implementation(platform(libs.aonyx.bom)) implementation(libs.togglz) implementation(libs.aves) @@ -18,10 +21,13 @@ dependencies { implementation(libs.minestom) implementation(libs.butterfly.minestom) - implementation(libs.luckperms.common) - implementation(libs.luckperms.common.loader.utils) - implementation(libs.luckperms.minestom.app) - implementation(libs.luckperms.minestom) + runtimeOnly(libs.luckperms.minestom.loader) { + exclude(group = "net.kyori.adventure") + } + compileOnly(libs.luckperms.minestom.loader) { + exclude(group = "net.kyori.adventure") + } + implementation(platform(libs.cloudnet.bom)) implementation(libs.cloudnet.jvm.wrapper) @@ -40,6 +46,15 @@ dependencies { testImplementation(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.engine) } + +// The LuckPerms minestom-loader is a JarInJar bootstrap that bundles an +// unrelocated, outdated Gson. Tests don't load LuckPerms, but as a runtimeOnly +// dependency the loader leaks into the test runtime classpath where its bundled +// Gson shadows the real one and breaks Minestom's registry init +// (GsonBuilder.disableJdkUnsafe NoSuchMethodError). Keep it off the test path. +configurations.testRuntimeClasspath { + exclude(group = "net.luckperms", module = "minestom-loader") +} application { mainClass.set("net.onelitefeather.titan.app.TitanApplication") } @@ -61,15 +76,72 @@ tasks { archiveClassifier.set("") archiveFileName.set("app-titan.jar") mergeServiceFiles() + // Shaded deps ship signed and multi-release jars that break a + // relocation-free application fat jar; drop signatures and module-info. + exclude("META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA") + exclude("module-info.class", "META-INF/versions/**/module-info.class") + duplicatesStrategy = DuplicatesStrategy.EXCLUDE } test { useJUnitPlatform() jvmArgs("-Dminestom.inside-test=true") } } + +// ---- Ahead-of-Time cache (JDK 25 / JEP 514) for faster lobby startup ---- +// A training run boots the shaded lobby once and records a portable AOT cache. +// Trained with the relative classpath "app-titan.jar" so the cache stays valid +// for any deployment launched as: +// java -XX:AOTCache=app-titan.aot -jar app-titan.jar +// (Cache is tied to the JDK 25 build and this jar; regenerated on every build.) +val aotTrainSeconds = providers.gradleProperty("titan.aot.trainSeconds").orElse("20") +val aotRunDir = layout.buildDirectory.dir("aot") +val aotCacheFile = layout.buildDirectory.file("aot/app-titan.aot") + +val generateAotCache = tasks.register("generateAotCache") { + group = "build" + description = "Generates a JDK 25 AOT cache (app-titan.aot) for faster lobby startup." + + val shadowJarTask = tasks.named("shadowJar") + dependsOn(shadowJarTask) + val jarProvider = shadowJarTask.flatMap { (it as Jar).archiveFile } + val worldsDir = rootProject.layout.projectDirectory.dir("worlds") + inputs.file(jarProvider) + inputs.dir(worldsDir) + outputs.file(aotCacheFile) + + val launcher = javaToolchains.launcherFor { languageVersion.set(JavaLanguageVersion.of(25)) } + val runDir = aotRunDir.get().asFile + val rootDir = rootProject.projectDir + val trainSeconds = aotTrainSeconds + workingDir = runDir + + doFirst { + runDir.deleteRecursively() + runDir.mkdirs() + // Relative classpath: the cache records "app-titan.jar", matching the + // deployment launch command above. + jarProvider.get().asFile.copyTo(runDir.resolve("app-titan.jar"), overwrite = true) + // The lobby loads worlds/ (+ app.json) relative to the CWD while booting. + Files.createSymbolicLink(runDir.resolve("worlds").toPath(), rootDir.resolve("worlds").toPath()) + rootDir.resolve("app.json").takeIf { it.exists() }?.copyTo(runDir.resolve("app.json"), overwrite = true) + executable = launcher.get().executablePath.asFile.absolutePath + args( + "-Dtitan.aot.trainSeconds=${trainSeconds.get()}", + "-XX:AOTCacheOutput=app-titan.aot", + "-jar", "app-titan.jar" + ) + } +} publishing { publications.create("maven") { artifact(project.tasks.getByName("shadowJar")) + // AOT cache shipped alongside the jar for faster startup; see generateAotCache. + artifact(aotCacheFile) { + classifier = "aot" + extension = "aot" + builtBy(generateAotCache) + } version = rootProject.version as String artifactId = "titan-app" groupId = rootProject.group as String diff --git a/app/src/main/java/net/onelitefeather/titan/app/TitanApplication.java b/app/src/main/java/net/onelitefeather/titan/app/TitanApplication.java index a745f6c..28b1285 100644 --- a/app/src/main/java/net/onelitefeather/titan/app/TitanApplication.java +++ b/app/src/main/java/net/onelitefeather/titan/app/TitanApplication.java @@ -18,17 +18,42 @@ import eu.cloudnetservice.driver.inject.InjectionLayer; import eu.cloudnetservice.modules.bridge.impl.platform.minestom.MinestomBridgeExtension; import net.minestom.server.MinecraftServer; -import net.onelitefeather.titan.app.luckperms.MinestomLoader; + +import java.nio.file.Files; +import java.nio.file.Path; + public class TitanApplication { public static void main(String[] args) { MinecraftServer minecraftServer = MinecraftServer.init(); - MinestomLoader.get().load().registerShutdownHook().start(); + me.lucko.luckperms.minestom.loader.MinestomLoader.get().load().registerShutdownHook().start(); Titan titan = new Titan(); titan.initialize(); - InjectionLayer.ext().instance(MinestomBridgeExtension.class).onLoad(); + + // CloudNet only provides its runtime when the service is launched through + // its wrapper, which creates a ".wrapper" directory in the working + // directory. When running standalone (local, tests, AOT training) there + // is no CloudNet to bind to, so skip the bridge to avoid failing startup. + if (Files.isDirectory(Path.of(".wrapper"))) { + InjectionLayer.ext().instance(MinestomBridgeExtension.class).onLoad(); + } minecraftServer.start("localhost", 25565); + + // AOT training aid: when -Dtitan.aot.trainSeconds= is set, shut down + // cleanly after the server has started so the JVM exit writes the AOT + // configuration/cache. No effect in normal operation. + Long aotTrainSeconds = Long.getLong("titan.aot.trainSeconds"); + if (aotTrainSeconds != null) { + Thread.ofVirtual().name("titan-aot-trainer").start(() -> { + try { + Thread.sleep(aotTrainSeconds * 1000L); + } catch (InterruptedException ignored) { + Thread.currentThread().interrupt(); + } + System.exit(0); + }); + } } } diff --git a/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerConfigurationListener.java b/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerConfigurationListener.java index 74ef466..7b26ff5 100644 --- a/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerConfigurationListener.java +++ b/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerConfigurationListener.java @@ -33,6 +33,6 @@ public PlayerConfigurationListener(MapProvider mapProvider) { @Override public void accept(AsyncPlayerConfigurationEvent event) { Optional.ofNullable(this.mapProvider).map(MapProvider::getInstance).ifPresent(event::setSpawningInstance); - Optional.of(this.mapProvider).map(MapProvider::getActiveLobby).map(LobbyMap::getSpawn).ifPresent(event.getPlayer()::setRespawnPoint); + Optional.of(this.mapProvider).map(MapProvider::getActiveLobby).map(LobbyMap::spawn).ifPresent(event.getPlayer()::setRespawnPoint); } } diff --git a/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerMoveListener.java b/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerMoveListener.java index 30befb9..74dbc59 100644 --- a/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerMoveListener.java +++ b/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerMoveListener.java @@ -37,11 +37,11 @@ public void accept(PlayerMoveEvent playerMoveEvent) { if (player.getInstance() == null) return; if (player.getPosition().y() < appConfig.minHeightBeforeTeleport()) { - Optional.ofNullable(this.lobbyMap).map(LobbyMap::getSpawn).ifPresent(player::teleport); + Optional.ofNullable(this.lobbyMap).map(LobbyMap::spawn).ifPresent(player::teleport); return; } if (player.getPosition().y() > appConfig.maxHeightBeforeTeleport()) { - Optional.ofNullable(this.lobbyMap).map(LobbyMap::getSpawn).ifPresent(player::teleport); + Optional.ofNullable(this.lobbyMap).map(LobbyMap::spawn).ifPresent(player::teleport); } } } diff --git a/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerSpawnListener.java b/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerSpawnListener.java index 364623c..c6b1843 100644 --- a/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerSpawnListener.java +++ b/app/src/main/java/net/onelitefeather/titan/app/listener/PlayerSpawnListener.java @@ -40,7 +40,7 @@ public PlayerSpawnListener(AppConfig appConfig, LobbyMap lobbyMap, NavigationHel @Override public void accept(PlayerSpawnEvent event) { event.getPlayer().sendPacket(this.simulatedDistancePacket); - Optional.ofNullable(this.lobbyMap).map(LobbyMap::getSpawn).ifPresent(event.getPlayer()::teleport); + Optional.ofNullable(this.lobbyMap).map(LobbyMap::spawn).ifPresent(event.getPlayer()::teleport); this.navigationHelper.setItems(event.getPlayer()); } } diff --git a/app/src/main/java/net/onelitefeather/titan/app/luckperms/MinestomLoader.java b/app/src/main/java/net/onelitefeather/titan/app/luckperms/MinestomLoader.java deleted file mode 100644 index 6d02a54..0000000 --- a/app/src/main/java/net/onelitefeather/titan/app/luckperms/MinestomLoader.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright 2025 OneLiteFeather Network - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.onelitefeather.titan.app.luckperms; - - -import me.lucko.luckperms.minestom.LPMinestomBootstrap; -import me.lucko.luckperms.minestom.app.LuckPermsApplication; - -public final class MinestomLoader { - private static final LuckPermsApplication APPLICATION = new LuckPermsApplication(); - private static MinestomLoader instance; - private final LPMinestomBootstrap plugin; - - public MinestomLoader() { - this.plugin = new LPMinestomBootstrap(APPLICATION); - } - - public MinestomLoader registerShutdownHook() { - Runtime.getRuntime().addShutdownHook(new Thread(this.plugin::onDisable, "luckperms-shutdown-hook")); - return this; - } - - public MinestomLoader load() { - this.plugin.onLoad(); - return this; - } - - public void start() { - this.plugin.onEnable(); - } - - public static MinestomLoader get() { - MinestomLoader localInstance = instance; - if (localInstance != null) { - return localInstance; - } - synchronized (MinestomLoader.class) { - if (instance == null) { - instance = new MinestomLoader(); - } - return instance; - } - } -} diff --git a/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerMoveListenerTest.java b/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerMoveListenerTest.java index c17a76a..902f7ad 100644 --- a/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerMoveListenerTest.java +++ b/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerMoveListenerTest.java @@ -43,9 +43,8 @@ void testPlayerTeleportBelowMinHeight(Env env) { var appConfig = InternalAppConfig.defaultConfig(); // Create a real LobbyMap with a spawn point - var lobbyMap = LobbyMap.lobbyMapBuilder().build(); Pos spawnPos = new Pos(10, 100, 10); - lobbyMap.setSpawn(spawnPos); + var lobbyMap = LobbyMap.lobbyMapBuilder().spawn(spawnPos).build(); // Create the listener with real objects PlayerMoveListener listener = new PlayerMoveListener(appConfig, lobbyMap); @@ -76,9 +75,8 @@ void testPlayerTeleportAboveMaxHeight(Env env) { var appConfig = InternalAppConfig.defaultConfig(); // Create a real LobbyMap with a spawn point - var lobbyMap = LobbyMap.lobbyMapBuilder().build(); Pos spawnPos = new Pos(10, 100, 10); - lobbyMap.setSpawn(spawnPos); + var lobbyMap = LobbyMap.lobbyMapBuilder().spawn(spawnPos).build(); // Create the listener with real objects PlayerMoveListener listener = new PlayerMoveListener(appConfig, lobbyMap); @@ -109,9 +107,8 @@ void testPlayerNotTeleportedWithinLimits(Env env) { var appConfig = InternalAppConfig.defaultConfig(); // Create a real LobbyMap with a spawn point - var lobbyMap = LobbyMap.lobbyMapBuilder().build(); Pos spawnPos = new Pos(10, 100, 10); - lobbyMap.setSpawn(spawnPos); + var lobbyMap = LobbyMap.lobbyMapBuilder().spawn(spawnPos).build(); // Create the listener with real objects PlayerMoveListener listener = new PlayerMoveListener(appConfig, lobbyMap); diff --git a/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerSpawnListenerTest.java b/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerSpawnListenerTest.java index 8d8040c..509974c 100644 --- a/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerSpawnListenerTest.java +++ b/app/src/test/java/net/onelitefeather/titan/app/listener/PlayerSpawnListenerTest.java @@ -65,7 +65,7 @@ void testPlayerTeleport(Env env) { LobbyMap lobbyMap = mock(LobbyMap.class); var lobbyMapSpawn = new Pos(1, 2, 3); - when(lobbyMap.getSpawn()).thenReturn(lobbyMapSpawn); + when(lobbyMap.spawn()).thenReturn(lobbyMapSpawn); NavigationHelper navigationHelper = mock(NavigationHelper.class); MinecraftServer.getGlobalEventHandler().addListener(PlayerSpawnEvent.class, new PlayerSpawnListener(InternalAppConfig.defaultConfig(), lobbyMap, navigationHelper)); diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 3a81c71..6ffe986 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -5,7 +5,6 @@ plugins { dependencies { implementation(project(":api")) - implementation(enforcedPlatform(libs.mycelium.bom)) implementation(platform(libs.aonyx.bom)) implementation(libs.minestom) implementation(libs.togglz) diff --git a/common/src/main/java/net/onelitefeather/titan/common/config/AppConfigProvider.java b/common/src/main/java/net/onelitefeather/titan/common/config/AppConfigProvider.java index 91eac97..017b905 100644 --- a/common/src/main/java/net/onelitefeather/titan/common/config/AppConfigProvider.java +++ b/common/src/main/java/net/onelitefeather/titan/common/config/AppConfigProvider.java @@ -16,9 +16,11 @@ package net.onelitefeather.titan.common.config; import com.google.gson.Gson; +import net.kyori.adventure.key.Key; import net.minestom.server.coordinate.Pos; import net.minestom.server.coordinate.Vec; import net.theevilreaper.aves.file.GsonFileHandler; +import net.theevilreaper.aves.file.gson.KeyGsonAdapter; import net.theevilreaper.aves.file.gson.PositionGsonAdapter; import org.jetbrains.annotations.NotNull; @@ -35,7 +37,7 @@ public final class AppConfigProvider { private AppConfigProvider(Path path) { this.path = path; var typeAdapter = new PositionGsonAdapter(); - this.gson = new Gson().newBuilder().registerTypeAdapter(Pos.class, typeAdapter).registerTypeAdapter(Vec.class, typeAdapter).create(); + this.gson = new Gson().newBuilder().registerTypeAdapter(Pos.class, typeAdapter).registerTypeAdapter(Vec.class, typeAdapter).registerTypeHierarchyAdapter(Key.class, KeyGsonAdapter.create()).create(); this.fileHandler = new GsonFileHandler(this.gson); this.loadConfig(); } diff --git a/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMap.java b/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMap.java index d9c9952..0d0b770 100644 --- a/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMap.java +++ b/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMap.java @@ -18,21 +18,27 @@ import net.minestom.server.coordinate.Pos; import net.theevilreaper.aves.map.BaseMap; +import java.util.List; + public final class LobbyMap extends BaseMap { + public LobbyMap(String name, Pos spawn, List builders) { + super(name, spawn, builders); + } + public static Builder lobbyMapBuilder(LobbyMap map) { var builder = lobbyMapBuilder(); if (map == null) { return builder; } - if (map.getSpawn() != null) { - builder.spawn(map.getSpawn()); + if (map.spawn() != null) { + builder.spawn(map.spawn()); } - if (map.getName() != null) { - builder.name(map.getName()); + if (map.name() != null) { + builder.name(map.name()); } - if (map.getBuilders() != null) { - builder.author(map.getBuilders()); + if (map.builders() != null) { + builder.author(map.builders().toArray(new String[0])); } return builder; } diff --git a/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMapBuilder.java b/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMapBuilder.java index 51f7f06..1ac91fb 100644 --- a/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMapBuilder.java +++ b/common/src/main/java/net/onelitefeather/titan/common/map/LobbyMapBuilder.java @@ -17,6 +17,8 @@ import net.minestom.server.coordinate.Pos; +import java.util.List; + final class LobbyMapBuilder implements LobbyMap.Builder { private Pos spawn; @@ -43,18 +45,7 @@ public LobbyMap.Builder author(String... author) { @Override public LobbyMap build() { - LobbyMap lobbyMap = new LobbyMap(); - if (spawn != null) { - lobbyMap.setSpawn(spawn); - } - lobbyMap.setSpawn(spawn); - if (name != null) { - lobbyMap.setName(name); - ; - } - if (author != null) { - lobbyMap.setBuilders(author); - } - return lobbyMap; + List builders = author == null ? null : List.of(author); + return new LobbyMap(name, spawn, builders); } } diff --git a/common/src/main/java/net/onelitefeather/titan/common/map/MapProvider.java b/common/src/main/java/net/onelitefeather/titan/common/map/MapProvider.java index 347ab03..2277ed1 100644 --- a/common/src/main/java/net/onelitefeather/titan/common/map/MapProvider.java +++ b/common/src/main/java/net/onelitefeather/titan/common/map/MapProvider.java @@ -76,8 +76,8 @@ private void loadMapData() { try { this.activeLobby = lobbyData.orElse(LobbyMap.lobbyMapBuilder().build()); - if (this.activeLobby.getSpawn() != null) { - loadChunk(this.instance, this.activeLobby.getSpawn()); + if (this.activeLobby.spawn() != null) { + loadChunk(this.instance, this.activeLobby.spawn()); } } catch (NoSuchElementException noSuchElementException) { LOGGER.error("Failed to load the lobby data"); diff --git a/settings.gradle.kts b/settings.gradle.kts index 774c1d2..f05f4ed 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,8 +26,7 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { - version("aonyx-bom", "0.7.1") - version("mycelium-bom", "1.6.7") + version("aonyx-bom", "0.7.3") version("cloudnet", "4.0.0-RC17-SNAPSHOT") version("butterfly", "1.0.23") @@ -42,9 +41,8 @@ dependencyResolutionManagement { // Minestom library("aonyx-bom", "net.onelitefeather", "aonyx-bom").versionRef("aonyx-bom") - library("mycelium-bom", "net.onelitefeather", "mycelium-bom").versionRef("mycelium-bom") library("minestom","net.minestom", "minestom").withoutVersion() - library("aves", "net.theevilreaper", "aves").version("1.9.0") + library("aves", "net.theevilreaper", "aves").version("1.14.1") library("adventure.minimessage", "net.kyori", "adventure-text-minimessage").withoutVersion() library("butterfly-minestom", "net.onelitefeather", "butterfly-minestom").versionRef("butterfly") @@ -65,10 +63,7 @@ dependencyResolutionManagement { library("junit.platform.launcher", "org.junit.platform", "junit-platform-launcher").withoutVersion() library("luckperms.api", "net.luckperms", "api").versionRef("luckperms") - library("luckperms.minestom", "net.luckperms", "minestom").versionRef("luckperms") - library("luckperms.minestom.app", "net.luckperms", "minestom-app").versionRef("luckperms") - library("luckperms.common", "net.luckperms", "common").versionRef("luckperms") - library("luckperms.common.loader.utils", "net.luckperms", "loader-utils").versionRef("luckperms") + library("luckperms.minestom.loader", "net.luckperms", "minestom-loader").versionRef("luckperms") library("cyano", "net.onelitefeather", "cyano").withoutVersion() library("mockito", "org.mockito", "mockito-core").versionRef("mockito") diff --git a/setup/build.gradle.kts b/setup/build.gradle.kts index 90c49d1..cb967ca 100644 --- a/setup/build.gradle.kts +++ b/setup/build.gradle.kts @@ -9,7 +9,6 @@ plugins { dependencies { implementation(project(":common")) implementation(project(":api")) - implementation(enforcedPlatform(libs.mycelium.bom)) implementation(platform(libs.aonyx.bom)) implementation(libs.minestom) implementation(libs.togglz) @@ -17,7 +16,7 @@ dependencies { implementation(libs.adventure.minimessage) implementation(libs.caffeine) - testImplementation(platform(libs.mycelium.bom)) + testImplementation(platform(libs.aonyx.bom)) testImplementation(libs.junit.api) testImplementation(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.engine) diff --git a/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerConfigurationListener.java b/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerConfigurationListener.java index a573f8e..9a4e3c2 100644 --- a/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerConfigurationListener.java +++ b/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerConfigurationListener.java @@ -36,7 +36,7 @@ public PlayerConfigurationListener(MapProvider mapProvider) { public void accept(AsyncPlayerConfigurationEvent event) { event.setSpawningInstance(this.mapProvider.getInstance()); event.getPlayer().setGameMode(GameMode.CREATIVE); - Pos pos = Optional.of(this.mapProvider).map(MapProvider::getActiveLobby).map(LobbyMap::getSpawn).orElse(null); + Pos pos = Optional.of(this.mapProvider).map(MapProvider::getActiveLobby).map(LobbyMap::spawn).orElse(null); if (pos == null) return; event.getPlayer().setRespawnPoint(pos); diff --git a/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerSpawnListener.java b/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerSpawnListener.java index 168bb97..315741a 100644 --- a/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerSpawnListener.java +++ b/setup/src/main/java/net/onelitefeather/titan/setup/listener/PlayerSpawnListener.java @@ -39,6 +39,6 @@ public PlayerSpawnListener(AppConfig appConfig, MapProvider mapProvider) { @Override public void accept(PlayerSpawnEvent event) { event.getPlayer().sendPacket(this.simulatedDistancePacket); - Optional.of(this.mapProvider).map(MapProvider::getActiveLobby).map(LobbyMap::getSpawn).ifPresent(event.getPlayer()::teleport); + Optional.of(this.mapProvider).map(MapProvider::getActiveLobby).map(LobbyMap::spawn).ifPresent(event.getPlayer()::teleport); } } diff --git a/test-server/worlds/halloween/entities/r.-1.-1.mca b/test-server/worlds/halloween/entities/r.-1.-1.mca index 8c045be..c1d5dfa 100755 Binary files a/test-server/worlds/halloween/entities/r.-1.-1.mca and b/test-server/worlds/halloween/entities/r.-1.-1.mca differ diff --git a/test-server/worlds/halloween/entities/r.-1.0.mca b/test-server/worlds/halloween/entities/r.-1.0.mca index 53ad9c4..867363f 100755 Binary files a/test-server/worlds/halloween/entities/r.-1.0.mca and b/test-server/worlds/halloween/entities/r.-1.0.mca differ diff --git a/test-server/worlds/halloween/entities/r.0.-1.mca b/test-server/worlds/halloween/entities/r.0.-1.mca index 0481f7f..80994e1 100755 Binary files a/test-server/worlds/halloween/entities/r.0.-1.mca and b/test-server/worlds/halloween/entities/r.0.-1.mca differ diff --git a/test-server/worlds/halloween/entities/r.0.0.mca b/test-server/worlds/halloween/entities/r.0.0.mca index 05410e3..afa3a19 100755 Binary files a/test-server/worlds/halloween/entities/r.0.0.mca and b/test-server/worlds/halloween/entities/r.0.0.mca differ diff --git a/test-server/worlds/halloween/level.dat b/test-server/worlds/halloween/level.dat index c07334e..75e4ee8 100644 Binary files a/test-server/worlds/halloween/level.dat and b/test-server/worlds/halloween/level.dat differ diff --git a/test-server/worlds/halloween/level.dat_old b/test-server/worlds/halloween/level.dat_old index e956d7f..c07334e 100644 Binary files a/test-server/worlds/halloween/level.dat_old and b/test-server/worlds/halloween/level.dat_old differ diff --git a/test-server/worlds/halloween/poi/r.-1.-1.mca b/test-server/worlds/halloween/poi/r.-1.-1.mca index 5fef72f..f3de59e 100755 Binary files a/test-server/worlds/halloween/poi/r.-1.-1.mca and b/test-server/worlds/halloween/poi/r.-1.-1.mca differ diff --git a/test-server/worlds/halloween/poi/r.-1.0.mca b/test-server/worlds/halloween/poi/r.-1.0.mca index 4fbd8fd..a8ff966 100755 Binary files a/test-server/worlds/halloween/poi/r.-1.0.mca and b/test-server/worlds/halloween/poi/r.-1.0.mca differ diff --git a/test-server/worlds/halloween/poi/r.0.-1.mca b/test-server/worlds/halloween/poi/r.0.-1.mca index 4ba530b..820c8a3 100755 Binary files a/test-server/worlds/halloween/poi/r.0.-1.mca and b/test-server/worlds/halloween/poi/r.0.-1.mca differ diff --git a/test-server/worlds/halloween/poi/r.0.0.mca b/test-server/worlds/halloween/poi/r.0.0.mca index b791761..f68c2b0 100755 Binary files a/test-server/worlds/halloween/poi/r.0.0.mca and b/test-server/worlds/halloween/poi/r.0.0.mca differ diff --git a/test-server/worlds/halloween/region/r.-1.-1.mca b/test-server/worlds/halloween/region/r.-1.-1.mca index 4d2313f..8d819d2 100755 Binary files a/test-server/worlds/halloween/region/r.-1.-1.mca and b/test-server/worlds/halloween/region/r.-1.-1.mca differ diff --git a/test-server/worlds/halloween/region/r.-1.-2.mca b/test-server/worlds/halloween/region/r.-1.-2.mca index 551f56d..99b1692 100755 Binary files a/test-server/worlds/halloween/region/r.-1.-2.mca and b/test-server/worlds/halloween/region/r.-1.-2.mca differ diff --git a/test-server/worlds/halloween/region/r.-1.-3.mca b/test-server/worlds/halloween/region/r.-1.-3.mca index 7eb87c2..94ff39c 100755 Binary files a/test-server/worlds/halloween/region/r.-1.-3.mca and b/test-server/worlds/halloween/region/r.-1.-3.mca differ diff --git a/test-server/worlds/halloween/region/r.-1.0.mca b/test-server/worlds/halloween/region/r.-1.0.mca index 749c803..3417742 100755 Binary files a/test-server/worlds/halloween/region/r.-1.0.mca and b/test-server/worlds/halloween/region/r.-1.0.mca differ diff --git a/test-server/worlds/halloween/region/r.-1.1.mca b/test-server/worlds/halloween/region/r.-1.1.mca index 19a5b7a..d568d94 100755 Binary files a/test-server/worlds/halloween/region/r.-1.1.mca and b/test-server/worlds/halloween/region/r.-1.1.mca differ diff --git a/test-server/worlds/halloween/region/r.-2.-1.mca b/test-server/worlds/halloween/region/r.-2.-1.mca index eee449b..5f0cdd4 100755 Binary files a/test-server/worlds/halloween/region/r.-2.-1.mca and b/test-server/worlds/halloween/region/r.-2.-1.mca differ diff --git a/test-server/worlds/halloween/region/r.-2.-2.mca b/test-server/worlds/halloween/region/r.-2.-2.mca index dd0daeb..c69a9b5 100755 Binary files a/test-server/worlds/halloween/region/r.-2.-2.mca and b/test-server/worlds/halloween/region/r.-2.-2.mca differ diff --git a/test-server/worlds/halloween/region/r.-2.-3.mca b/test-server/worlds/halloween/region/r.-2.-3.mca index efd004a..c05d1dd 100755 Binary files a/test-server/worlds/halloween/region/r.-2.-3.mca and b/test-server/worlds/halloween/region/r.-2.-3.mca differ diff --git a/test-server/worlds/halloween/region/r.-2.0.mca b/test-server/worlds/halloween/region/r.-2.0.mca index 20e3275..d67487b 100755 Binary files a/test-server/worlds/halloween/region/r.-2.0.mca and b/test-server/worlds/halloween/region/r.-2.0.mca differ diff --git a/test-server/worlds/halloween/region/r.-2.1.mca b/test-server/worlds/halloween/region/r.-2.1.mca index ff238dc..146638d 100755 Binary files a/test-server/worlds/halloween/region/r.-2.1.mca and b/test-server/worlds/halloween/region/r.-2.1.mca differ diff --git a/test-server/worlds/halloween/region/r.0.-1.mca b/test-server/worlds/halloween/region/r.0.-1.mca index 1c46200..d3fe2dd 100755 Binary files a/test-server/worlds/halloween/region/r.0.-1.mca and b/test-server/worlds/halloween/region/r.0.-1.mca differ diff --git a/test-server/worlds/halloween/region/r.0.-2.mca b/test-server/worlds/halloween/region/r.0.-2.mca index de9273f..751dc4c 100755 Binary files a/test-server/worlds/halloween/region/r.0.-2.mca and b/test-server/worlds/halloween/region/r.0.-2.mca differ diff --git a/test-server/worlds/halloween/region/r.0.-3.mca b/test-server/worlds/halloween/region/r.0.-3.mca index 262ecdc..b54fe63 100755 Binary files a/test-server/worlds/halloween/region/r.0.-3.mca and b/test-server/worlds/halloween/region/r.0.-3.mca differ diff --git a/test-server/worlds/halloween/region/r.0.0.mca b/test-server/worlds/halloween/region/r.0.0.mca index 01f5056..48a247c 100755 Binary files a/test-server/worlds/halloween/region/r.0.0.mca and b/test-server/worlds/halloween/region/r.0.0.mca differ diff --git a/test-server/worlds/halloween/region/r.0.1.mca b/test-server/worlds/halloween/region/r.0.1.mca index 940cc56..deeb633 100755 Binary files a/test-server/worlds/halloween/region/r.0.1.mca and b/test-server/worlds/halloween/region/r.0.1.mca differ diff --git a/test-server/worlds/halloween/region/r.1.-1.mca b/test-server/worlds/halloween/region/r.1.-1.mca index e8bd365..91c2b05 100755 Binary files a/test-server/worlds/halloween/region/r.1.-1.mca and b/test-server/worlds/halloween/region/r.1.-1.mca differ diff --git a/test-server/worlds/halloween/region/r.1.-2.mca b/test-server/worlds/halloween/region/r.1.-2.mca index 70ee1c9..6fbf97c 100755 Binary files a/test-server/worlds/halloween/region/r.1.-2.mca and b/test-server/worlds/halloween/region/r.1.-2.mca differ diff --git a/test-server/worlds/halloween/region/r.1.-3.mca b/test-server/worlds/halloween/region/r.1.-3.mca index b6f8774..454665f 100755 Binary files a/test-server/worlds/halloween/region/r.1.-3.mca and b/test-server/worlds/halloween/region/r.1.-3.mca differ diff --git a/test-server/worlds/halloween/region/r.1.0.mca b/test-server/worlds/halloween/region/r.1.0.mca index 72ebde4..f30b064 100755 Binary files a/test-server/worlds/halloween/region/r.1.0.mca and b/test-server/worlds/halloween/region/r.1.0.mca differ diff --git a/test-server/worlds/halloween/region/r.1.1.mca b/test-server/worlds/halloween/region/r.1.1.mca index b4bde0f..1117ae2 100755 Binary files a/test-server/worlds/halloween/region/r.1.1.mca and b/test-server/worlds/halloween/region/r.1.1.mca differ diff --git a/test-server/worlds/halloween/region/r.1.2.mca b/test-server/worlds/halloween/region/r.1.2.mca index 8f2e2c5..1149e02 100755 Binary files a/test-server/worlds/halloween/region/r.1.2.mca and b/test-server/worlds/halloween/region/r.1.2.mca differ diff --git a/test-server/worlds/halloween/region/r.1.3.mca b/test-server/worlds/halloween/region/r.1.3.mca index 42545ba..0114325 100755 Binary files a/test-server/worlds/halloween/region/r.1.3.mca and b/test-server/worlds/halloween/region/r.1.3.mca differ diff --git a/test-server/worlds/halloween/region/r.2.-1.mca b/test-server/worlds/halloween/region/r.2.-1.mca index 0451b0e..ee91409 100755 Binary files a/test-server/worlds/halloween/region/r.2.-1.mca and b/test-server/worlds/halloween/region/r.2.-1.mca differ diff --git a/test-server/worlds/halloween/region/r.2.-2.mca b/test-server/worlds/halloween/region/r.2.-2.mca index d13965d..217ac53 100755 Binary files a/test-server/worlds/halloween/region/r.2.-2.mca and b/test-server/worlds/halloween/region/r.2.-2.mca differ diff --git a/test-server/worlds/halloween/region/r.2.0.mca b/test-server/worlds/halloween/region/r.2.0.mca index 4840420..6c8e9da 100755 Binary files a/test-server/worlds/halloween/region/r.2.0.mca and b/test-server/worlds/halloween/region/r.2.0.mca differ diff --git a/test-server/worlds/halloween/region/r.2.1.mca b/test-server/worlds/halloween/region/r.2.1.mca index 9105610..c95e64a 100755 Binary files a/test-server/worlds/halloween/region/r.2.1.mca and b/test-server/worlds/halloween/region/r.2.1.mca differ diff --git a/test-server/worlds/halloween/region/r.2.2.mca b/test-server/worlds/halloween/region/r.2.2.mca index 7f54cea..621ec55 100755 Binary files a/test-server/worlds/halloween/region/r.2.2.mca and b/test-server/worlds/halloween/region/r.2.2.mca differ diff --git a/test-server/worlds/halloween/region/r.2.3.mca b/test-server/worlds/halloween/region/r.2.3.mca index 092abff..1e1b776 100755 Binary files a/test-server/worlds/halloween/region/r.2.3.mca and b/test-server/worlds/halloween/region/r.2.3.mca differ diff --git a/test-server/worlds/halloween/region/r.3.0.mca b/test-server/worlds/halloween/region/r.3.0.mca index db44a8a..c641ae1 100755 Binary files a/test-server/worlds/halloween/region/r.3.0.mca and b/test-server/worlds/halloween/region/r.3.0.mca differ diff --git a/test-server/worlds/winter/entities/r.-1.-1.mca b/test-server/worlds/winter/entities/r.-1.-1.mca index 04f16c7..0011620 100755 Binary files a/test-server/worlds/winter/entities/r.-1.-1.mca and b/test-server/worlds/winter/entities/r.-1.-1.mca differ diff --git a/test-server/worlds/winter/entities/r.-1.0.mca b/test-server/worlds/winter/entities/r.-1.0.mca index 39631c3..1127848 100755 Binary files a/test-server/worlds/winter/entities/r.-1.0.mca and b/test-server/worlds/winter/entities/r.-1.0.mca differ diff --git a/test-server/worlds/winter/entities/r.0.-1.mca b/test-server/worlds/winter/entities/r.0.-1.mca index c28dd5a..85e9918 100755 Binary files a/test-server/worlds/winter/entities/r.0.-1.mca and b/test-server/worlds/winter/entities/r.0.-1.mca differ diff --git a/test-server/worlds/winter/entities/r.0.0.mca b/test-server/worlds/winter/entities/r.0.0.mca index f7b7754..c315aa6 100755 Binary files a/test-server/worlds/winter/entities/r.0.0.mca and b/test-server/worlds/winter/entities/r.0.0.mca differ diff --git a/test-server/worlds/winter/level.dat b/test-server/worlds/winter/level.dat index f258386..d4c2d00 100644 Binary files a/test-server/worlds/winter/level.dat and b/test-server/worlds/winter/level.dat differ diff --git a/test-server/worlds/winter/level.dat_old b/test-server/worlds/winter/level.dat_old index 85fb554..0d8a38c 100644 Binary files a/test-server/worlds/winter/level.dat_old and b/test-server/worlds/winter/level.dat_old differ diff --git a/test-server/worlds/winter/poi/r.-1.-1.mca b/test-server/worlds/winter/poi/r.-1.-1.mca index 5fef72f..7150cb0 100755 Binary files a/test-server/worlds/winter/poi/r.-1.-1.mca and b/test-server/worlds/winter/poi/r.-1.-1.mca differ diff --git a/test-server/worlds/winter/poi/r.-1.0.mca b/test-server/worlds/winter/poi/r.-1.0.mca index c4e580e..f4305e7 100755 Binary files a/test-server/worlds/winter/poi/r.-1.0.mca and b/test-server/worlds/winter/poi/r.-1.0.mca differ diff --git a/test-server/worlds/winter/poi/r.0.-1.mca b/test-server/worlds/winter/poi/r.0.-1.mca index 9a65ecb..e538514 100755 Binary files a/test-server/worlds/winter/poi/r.0.-1.mca and b/test-server/worlds/winter/poi/r.0.-1.mca differ diff --git a/test-server/worlds/winter/poi/r.0.0.mca b/test-server/worlds/winter/poi/r.0.0.mca index eac04b0..557ef4b 100755 Binary files a/test-server/worlds/winter/poi/r.0.0.mca and b/test-server/worlds/winter/poi/r.0.0.mca differ diff --git a/test-server/worlds/winter/region/r.-1.-1.mca b/test-server/worlds/winter/region/r.-1.-1.mca index 69df59a..fc869d7 100755 Binary files a/test-server/worlds/winter/region/r.-1.-1.mca and b/test-server/worlds/winter/region/r.-1.-1.mca differ diff --git a/test-server/worlds/winter/region/r.-1.-2.mca b/test-server/worlds/winter/region/r.-1.-2.mca index 9485e61..2fd3b47 100755 Binary files a/test-server/worlds/winter/region/r.-1.-2.mca and b/test-server/worlds/winter/region/r.-1.-2.mca differ diff --git a/test-server/worlds/winter/region/r.-1.-3.mca b/test-server/worlds/winter/region/r.-1.-3.mca index 7eb87c2..a761516 100755 Binary files a/test-server/worlds/winter/region/r.-1.-3.mca and b/test-server/worlds/winter/region/r.-1.-3.mca differ diff --git a/test-server/worlds/winter/region/r.-1.0.mca b/test-server/worlds/winter/region/r.-1.0.mca index 56eaa97..f3d98c3 100755 Binary files a/test-server/worlds/winter/region/r.-1.0.mca and b/test-server/worlds/winter/region/r.-1.0.mca differ diff --git a/test-server/worlds/winter/region/r.-1.1.mca b/test-server/worlds/winter/region/r.-1.1.mca index 47bf42b..5927eda 100755 Binary files a/test-server/worlds/winter/region/r.-1.1.mca and b/test-server/worlds/winter/region/r.-1.1.mca differ diff --git a/test-server/worlds/winter/region/r.-2.-1.mca b/test-server/worlds/winter/region/r.-2.-1.mca index c610dea..637a3da 100755 Binary files a/test-server/worlds/winter/region/r.-2.-1.mca and b/test-server/worlds/winter/region/r.-2.-1.mca differ diff --git a/test-server/worlds/winter/region/r.-2.-2.mca b/test-server/worlds/winter/region/r.-2.-2.mca index ea127b6..5700031 100755 Binary files a/test-server/worlds/winter/region/r.-2.-2.mca and b/test-server/worlds/winter/region/r.-2.-2.mca differ diff --git a/test-server/worlds/winter/region/r.-2.-3.mca b/test-server/worlds/winter/region/r.-2.-3.mca index efd004a..ca10060 100755 Binary files a/test-server/worlds/winter/region/r.-2.-3.mca and b/test-server/worlds/winter/region/r.-2.-3.mca differ diff --git a/test-server/worlds/winter/region/r.-2.0.mca b/test-server/worlds/winter/region/r.-2.0.mca index 6dbad8d..ef96f9b 100755 Binary files a/test-server/worlds/winter/region/r.-2.0.mca and b/test-server/worlds/winter/region/r.-2.0.mca differ diff --git a/test-server/worlds/winter/region/r.-2.1.mca b/test-server/worlds/winter/region/r.-2.1.mca index 635f736..722de2a 100755 Binary files a/test-server/worlds/winter/region/r.-2.1.mca and b/test-server/worlds/winter/region/r.-2.1.mca differ diff --git a/test-server/worlds/winter/region/r.0.-1.mca b/test-server/worlds/winter/region/r.0.-1.mca index cb9ba76..4d87850 100755 Binary files a/test-server/worlds/winter/region/r.0.-1.mca and b/test-server/worlds/winter/region/r.0.-1.mca differ diff --git a/test-server/worlds/winter/region/r.0.-2.mca b/test-server/worlds/winter/region/r.0.-2.mca index bc7cf4e..b411f43 100755 Binary files a/test-server/worlds/winter/region/r.0.-2.mca and b/test-server/worlds/winter/region/r.0.-2.mca differ diff --git a/test-server/worlds/winter/region/r.0.-3.mca b/test-server/worlds/winter/region/r.0.-3.mca index 262ecdc..dc45295 100755 Binary files a/test-server/worlds/winter/region/r.0.-3.mca and b/test-server/worlds/winter/region/r.0.-3.mca differ diff --git a/test-server/worlds/winter/region/r.0.0.mca b/test-server/worlds/winter/region/r.0.0.mca index 8484738..3401b6e 100755 Binary files a/test-server/worlds/winter/region/r.0.0.mca and b/test-server/worlds/winter/region/r.0.0.mca differ diff --git a/test-server/worlds/winter/region/r.0.1.mca b/test-server/worlds/winter/region/r.0.1.mca index 5684473..93efc50 100755 Binary files a/test-server/worlds/winter/region/r.0.1.mca and b/test-server/worlds/winter/region/r.0.1.mca differ diff --git a/test-server/worlds/winter/region/r.1.-1.mca b/test-server/worlds/winter/region/r.1.-1.mca index 94d68e2..2938f23 100755 Binary files a/test-server/worlds/winter/region/r.1.-1.mca and b/test-server/worlds/winter/region/r.1.-1.mca differ diff --git a/test-server/worlds/winter/region/r.1.-2.mca b/test-server/worlds/winter/region/r.1.-2.mca index 004f6c3..fc7926b 100755 Binary files a/test-server/worlds/winter/region/r.1.-2.mca and b/test-server/worlds/winter/region/r.1.-2.mca differ diff --git a/test-server/worlds/winter/region/r.1.-3.mca b/test-server/worlds/winter/region/r.1.-3.mca index b6f8774..cf5806d 100755 Binary files a/test-server/worlds/winter/region/r.1.-3.mca and b/test-server/worlds/winter/region/r.1.-3.mca differ diff --git a/test-server/worlds/winter/region/r.1.0.mca b/test-server/worlds/winter/region/r.1.0.mca index 982b711..b5abd05 100755 Binary files a/test-server/worlds/winter/region/r.1.0.mca and b/test-server/worlds/winter/region/r.1.0.mca differ diff --git a/test-server/worlds/winter/region/r.1.1.mca b/test-server/worlds/winter/region/r.1.1.mca index 805ab85..9ba3861 100755 Binary files a/test-server/worlds/winter/region/r.1.1.mca and b/test-server/worlds/winter/region/r.1.1.mca differ diff --git a/test-server/worlds/winter/region/r.1.2.mca b/test-server/worlds/winter/region/r.1.2.mca index a02f6b1..6bb857b 100755 Binary files a/test-server/worlds/winter/region/r.1.2.mca and b/test-server/worlds/winter/region/r.1.2.mca differ diff --git a/test-server/worlds/winter/region/r.1.3.mca b/test-server/worlds/winter/region/r.1.3.mca index 42545ba..bfec068 100755 Binary files a/test-server/worlds/winter/region/r.1.3.mca and b/test-server/worlds/winter/region/r.1.3.mca differ diff --git a/test-server/worlds/winter/region/r.2.-1.mca b/test-server/worlds/winter/region/r.2.-1.mca index 0451b0e..e54e981 100755 Binary files a/test-server/worlds/winter/region/r.2.-1.mca and b/test-server/worlds/winter/region/r.2.-1.mca differ diff --git a/test-server/worlds/winter/region/r.2.-2.mca b/test-server/worlds/winter/region/r.2.-2.mca index d13965d..b0b3bda 100755 Binary files a/test-server/worlds/winter/region/r.2.-2.mca and b/test-server/worlds/winter/region/r.2.-2.mca differ diff --git a/test-server/worlds/winter/region/r.2.0.mca b/test-server/worlds/winter/region/r.2.0.mca index 4840420..999e418 100755 Binary files a/test-server/worlds/winter/region/r.2.0.mca and b/test-server/worlds/winter/region/r.2.0.mca differ diff --git a/test-server/worlds/winter/region/r.2.1.mca b/test-server/worlds/winter/region/r.2.1.mca index bf31d21..a0159ee 100755 Binary files a/test-server/worlds/winter/region/r.2.1.mca and b/test-server/worlds/winter/region/r.2.1.mca differ diff --git a/test-server/worlds/winter/region/r.2.2.mca b/test-server/worlds/winter/region/r.2.2.mca index cdf5bf7..1aa00ab 100755 Binary files a/test-server/worlds/winter/region/r.2.2.mca and b/test-server/worlds/winter/region/r.2.2.mca differ diff --git a/test-server/worlds/winter/region/r.2.3.mca b/test-server/worlds/winter/region/r.2.3.mca index 092abff..fb07d64 100755 Binary files a/test-server/worlds/winter/region/r.2.3.mca and b/test-server/worlds/winter/region/r.2.3.mca differ diff --git a/test-server/worlds/winter/region/r.3.0.mca b/test-server/worlds/winter/region/r.3.0.mca index db44a8a..351dbf8 100755 Binary files a/test-server/worlds/winter/region/r.3.0.mca and b/test-server/worlds/winter/region/r.3.0.mca differ diff --git a/test-server/worlds/world/level.dat b/test-server/worlds/world/level.dat index f7bbba4..bf6df24 100644 Binary files a/test-server/worlds/world/level.dat and b/test-server/worlds/world/level.dat differ diff --git a/test-server/worlds/world/level.dat_old b/test-server/worlds/world/level.dat_old index f7bbba4..695f4ce 100644 Binary files a/test-server/worlds/world/level.dat_old and b/test-server/worlds/world/level.dat_old differ diff --git a/test-server/worlds/world/poi/r.-1.-1.mca b/test-server/worlds/world/poi/r.-1.-1.mca index e9d8685..cc89d88 100755 Binary files a/test-server/worlds/world/poi/r.-1.-1.mca and b/test-server/worlds/world/poi/r.-1.-1.mca differ diff --git a/test-server/worlds/world/poi/r.-1.0.mca b/test-server/worlds/world/poi/r.-1.0.mca index 4638782..a2e5996 100755 Binary files a/test-server/worlds/world/poi/r.-1.0.mca and b/test-server/worlds/world/poi/r.-1.0.mca differ diff --git a/test-server/worlds/world/poi/r.0.-1.mca b/test-server/worlds/world/poi/r.0.-1.mca index 9a65ecb..a7c03b8 100755 Binary files a/test-server/worlds/world/poi/r.0.-1.mca and b/test-server/worlds/world/poi/r.0.-1.mca differ diff --git a/test-server/worlds/world/poi/r.0.0.mca b/test-server/worlds/world/poi/r.0.0.mca index dd14694..4569690 100755 Binary files a/test-server/worlds/world/poi/r.0.0.mca and b/test-server/worlds/world/poi/r.0.0.mca differ diff --git a/test-server/worlds/world/region/r.-1.-1.mca b/test-server/worlds/world/region/r.-1.-1.mca index 337f2be..aa53cf3 100755 Binary files a/test-server/worlds/world/region/r.-1.-1.mca and b/test-server/worlds/world/region/r.-1.-1.mca differ diff --git a/test-server/worlds/world/region/r.-1.-2.mca b/test-server/worlds/world/region/r.-1.-2.mca index 4f1e391..72363de 100755 Binary files a/test-server/worlds/world/region/r.-1.-2.mca and b/test-server/worlds/world/region/r.-1.-2.mca differ diff --git a/test-server/worlds/world/region/r.-1.-3.mca b/test-server/worlds/world/region/r.-1.-3.mca index 7eb87c2..f1d8429 100755 Binary files a/test-server/worlds/world/region/r.-1.-3.mca and b/test-server/worlds/world/region/r.-1.-3.mca differ diff --git a/test-server/worlds/world/region/r.-1.0.mca b/test-server/worlds/world/region/r.-1.0.mca index 50d1606..ca74066 100755 Binary files a/test-server/worlds/world/region/r.-1.0.mca and b/test-server/worlds/world/region/r.-1.0.mca differ diff --git a/test-server/worlds/world/region/r.-1.1.mca b/test-server/worlds/world/region/r.-1.1.mca index d99a754..777f94e 100755 Binary files a/test-server/worlds/world/region/r.-1.1.mca and b/test-server/worlds/world/region/r.-1.1.mca differ diff --git a/test-server/worlds/world/region/r.-1.2.mca b/test-server/worlds/world/region/r.-1.2.mca index 0d73971..2386931 100644 Binary files a/test-server/worlds/world/region/r.-1.2.mca and b/test-server/worlds/world/region/r.-1.2.mca differ diff --git a/test-server/worlds/world/region/r.-2.-1.mca b/test-server/worlds/world/region/r.-2.-1.mca index 751442b..4a3c20d 100755 Binary files a/test-server/worlds/world/region/r.-2.-1.mca and b/test-server/worlds/world/region/r.-2.-1.mca differ diff --git a/test-server/worlds/world/region/r.-2.-2.mca b/test-server/worlds/world/region/r.-2.-2.mca index 3e5c015..685b9d3 100755 Binary files a/test-server/worlds/world/region/r.-2.-2.mca and b/test-server/worlds/world/region/r.-2.-2.mca differ diff --git a/test-server/worlds/world/region/r.-2.-3.mca b/test-server/worlds/world/region/r.-2.-3.mca index efd004a..e3c6f6e 100755 Binary files a/test-server/worlds/world/region/r.-2.-3.mca and b/test-server/worlds/world/region/r.-2.-3.mca differ diff --git a/test-server/worlds/world/region/r.-2.0.mca b/test-server/worlds/world/region/r.-2.0.mca index 0b842b7..5dd520e 100755 Binary files a/test-server/worlds/world/region/r.-2.0.mca and b/test-server/worlds/world/region/r.-2.0.mca differ diff --git a/test-server/worlds/world/region/r.-2.1.mca b/test-server/worlds/world/region/r.-2.1.mca index 252bd74..b61ed16 100755 Binary files a/test-server/worlds/world/region/r.-2.1.mca and b/test-server/worlds/world/region/r.-2.1.mca differ diff --git a/test-server/worlds/world/region/r.0.-1.mca b/test-server/worlds/world/region/r.0.-1.mca index 3d35397..0eef854 100755 Binary files a/test-server/worlds/world/region/r.0.-1.mca and b/test-server/worlds/world/region/r.0.-1.mca differ diff --git a/test-server/worlds/world/region/r.0.-2.mca b/test-server/worlds/world/region/r.0.-2.mca index cdf5654..06076e3 100755 Binary files a/test-server/worlds/world/region/r.0.-2.mca and b/test-server/worlds/world/region/r.0.-2.mca differ diff --git a/test-server/worlds/world/region/r.0.-3.mca b/test-server/worlds/world/region/r.0.-3.mca index 1016159..ab237cc 100755 Binary files a/test-server/worlds/world/region/r.0.-3.mca and b/test-server/worlds/world/region/r.0.-3.mca differ diff --git a/test-server/worlds/world/region/r.0.-4.mca b/test-server/worlds/world/region/r.0.-4.mca index 55db040..9ed79b9 100644 Binary files a/test-server/worlds/world/region/r.0.-4.mca and b/test-server/worlds/world/region/r.0.-4.mca differ diff --git a/test-server/worlds/world/region/r.0.0.mca b/test-server/worlds/world/region/r.0.0.mca index 089cf13..afabb44 100755 Binary files a/test-server/worlds/world/region/r.0.0.mca and b/test-server/worlds/world/region/r.0.0.mca differ diff --git a/test-server/worlds/world/region/r.0.1.mca b/test-server/worlds/world/region/r.0.1.mca index 22c7ee0..c9b70bc 100755 Binary files a/test-server/worlds/world/region/r.0.1.mca and b/test-server/worlds/world/region/r.0.1.mca differ diff --git a/test-server/worlds/world/region/r.0.2.mca b/test-server/worlds/world/region/r.0.2.mca index 6e5b496..62f1491 100644 Binary files a/test-server/worlds/world/region/r.0.2.mca and b/test-server/worlds/world/region/r.0.2.mca differ diff --git a/test-server/worlds/world/region/r.1.-1.mca b/test-server/worlds/world/region/r.1.-1.mca index c9cf3fb..ff15065 100755 Binary files a/test-server/worlds/world/region/r.1.-1.mca and b/test-server/worlds/world/region/r.1.-1.mca differ diff --git a/test-server/worlds/world/region/r.1.-2.mca b/test-server/worlds/world/region/r.1.-2.mca index 6cb864f..037f278 100755 Binary files a/test-server/worlds/world/region/r.1.-2.mca and b/test-server/worlds/world/region/r.1.-2.mca differ diff --git a/test-server/worlds/world/region/r.1.-3.mca b/test-server/worlds/world/region/r.1.-3.mca index b6f8774..4ff8f0c 100755 Binary files a/test-server/worlds/world/region/r.1.-3.mca and b/test-server/worlds/world/region/r.1.-3.mca differ diff --git a/test-server/worlds/world/region/r.1.0.mca b/test-server/worlds/world/region/r.1.0.mca index c7014db..e4f0dd5 100755 Binary files a/test-server/worlds/world/region/r.1.0.mca and b/test-server/worlds/world/region/r.1.0.mca differ diff --git a/test-server/worlds/world/region/r.1.1.mca b/test-server/worlds/world/region/r.1.1.mca index db99c9b..4b0ecf5 100755 Binary files a/test-server/worlds/world/region/r.1.1.mca and b/test-server/worlds/world/region/r.1.1.mca differ diff --git a/test-server/worlds/world/region/r.1.2.mca b/test-server/worlds/world/region/r.1.2.mca index ca57153..bd74f03 100755 Binary files a/test-server/worlds/world/region/r.1.2.mca and b/test-server/worlds/world/region/r.1.2.mca differ diff --git a/test-server/worlds/world/region/r.1.3.mca b/test-server/worlds/world/region/r.1.3.mca index 42545ba..de7873e 100755 Binary files a/test-server/worlds/world/region/r.1.3.mca and b/test-server/worlds/world/region/r.1.3.mca differ diff --git a/test-server/worlds/world/region/r.2.-1.mca b/test-server/worlds/world/region/r.2.-1.mca index 0451b0e..07edaf1 100755 Binary files a/test-server/worlds/world/region/r.2.-1.mca and b/test-server/worlds/world/region/r.2.-1.mca differ diff --git a/test-server/worlds/world/region/r.2.-2.mca b/test-server/worlds/world/region/r.2.-2.mca index d13965d..dc9c081 100755 Binary files a/test-server/worlds/world/region/r.2.-2.mca and b/test-server/worlds/world/region/r.2.-2.mca differ diff --git a/test-server/worlds/world/region/r.2.0.mca b/test-server/worlds/world/region/r.2.0.mca index 4840420..3e9cf16 100755 Binary files a/test-server/worlds/world/region/r.2.0.mca and b/test-server/worlds/world/region/r.2.0.mca differ diff --git a/test-server/worlds/world/region/r.2.1.mca b/test-server/worlds/world/region/r.2.1.mca index 88dd949..99830fb 100755 Binary files a/test-server/worlds/world/region/r.2.1.mca and b/test-server/worlds/world/region/r.2.1.mca differ diff --git a/test-server/worlds/world/region/r.2.2.mca b/test-server/worlds/world/region/r.2.2.mca index 4f7776d..8a994d5 100755 Binary files a/test-server/worlds/world/region/r.2.2.mca and b/test-server/worlds/world/region/r.2.2.mca differ diff --git a/test-server/worlds/world/region/r.2.3.mca b/test-server/worlds/world/region/r.2.3.mca index 092abff..e6f6946 100755 Binary files a/test-server/worlds/world/region/r.2.3.mca and b/test-server/worlds/world/region/r.2.3.mca differ diff --git a/test-server/worlds/world/region/r.3.0.mca b/test-server/worlds/world/region/r.3.0.mca index db44a8a..c7bf20a 100755 Binary files a/test-server/worlds/world/region/r.3.0.mca and b/test-server/worlds/world/region/r.3.0.mca differ diff --git a/test-server/worlds/world_generic/entities/r.-1.-1.mca b/test-server/worlds/world_generic/entities/r.-1.-1.mca index ab72ff2..3f58d84 100755 Binary files a/test-server/worlds/world_generic/entities/r.-1.-1.mca and b/test-server/worlds/world_generic/entities/r.-1.-1.mca differ diff --git a/test-server/worlds/world_generic/entities/r.-1.0.mca b/test-server/worlds/world_generic/entities/r.-1.0.mca index 83105d7..c01134c 100755 Binary files a/test-server/worlds/world_generic/entities/r.-1.0.mca and b/test-server/worlds/world_generic/entities/r.-1.0.mca differ diff --git a/test-server/worlds/world_generic/entities/r.0.-1.mca b/test-server/worlds/world_generic/entities/r.0.-1.mca index 27766b0..077c6fb 100755 Binary files a/test-server/worlds/world_generic/entities/r.0.-1.mca and b/test-server/worlds/world_generic/entities/r.0.-1.mca differ diff --git a/test-server/worlds/world_generic/entities/r.0.0.mca b/test-server/worlds/world_generic/entities/r.0.0.mca index 0c17571..2438ba9 100755 Binary files a/test-server/worlds/world_generic/entities/r.0.0.mca and b/test-server/worlds/world_generic/entities/r.0.0.mca differ diff --git a/test-server/worlds/world_generic/level.dat b/test-server/worlds/world_generic/level.dat index 5fc2eb9..6b1bf36 100755 Binary files a/test-server/worlds/world_generic/level.dat and b/test-server/worlds/world_generic/level.dat differ diff --git a/test-server/worlds/world_generic/level.dat_old b/test-server/worlds/world_generic/level.dat_old index de762b1..2f7c182 100755 Binary files a/test-server/worlds/world_generic/level.dat_old and b/test-server/worlds/world_generic/level.dat_old differ diff --git a/test-server/worlds/world_generic/poi/r.-1.-1.mca b/test-server/worlds/world_generic/poi/r.-1.-1.mca index 672492c..ebc111b 100755 Binary files a/test-server/worlds/world_generic/poi/r.-1.-1.mca and b/test-server/worlds/world_generic/poi/r.-1.-1.mca differ diff --git a/test-server/worlds/world_generic/poi/r.-1.0.mca b/test-server/worlds/world_generic/poi/r.-1.0.mca index 62b4fda..b4a24ed 100755 Binary files a/test-server/worlds/world_generic/poi/r.-1.0.mca and b/test-server/worlds/world_generic/poi/r.-1.0.mca differ diff --git a/test-server/worlds/world_generic/poi/r.0.-1.mca b/test-server/worlds/world_generic/poi/r.0.-1.mca index 197dfc9..4ebbeee 100755 Binary files a/test-server/worlds/world_generic/poi/r.0.-1.mca and b/test-server/worlds/world_generic/poi/r.0.-1.mca differ diff --git a/test-server/worlds/world_generic/poi/r.0.0.mca b/test-server/worlds/world_generic/poi/r.0.0.mca index ebb25ad..76b3784 100755 Binary files a/test-server/worlds/world_generic/poi/r.0.0.mca and b/test-server/worlds/world_generic/poi/r.0.0.mca differ diff --git a/test-server/worlds/world_generic/region/r.-1.-1.mca b/test-server/worlds/world_generic/region/r.-1.-1.mca index aedc1ba..31d0b8e 100755 Binary files a/test-server/worlds/world_generic/region/r.-1.-1.mca and b/test-server/worlds/world_generic/region/r.-1.-1.mca differ diff --git a/test-server/worlds/world_generic/region/r.-1.-2.mca b/test-server/worlds/world_generic/region/r.-1.-2.mca index b84a062..1f04ec7 100755 Binary files a/test-server/worlds/world_generic/region/r.-1.-2.mca and b/test-server/worlds/world_generic/region/r.-1.-2.mca differ diff --git a/test-server/worlds/world_generic/region/r.-1.-3.mca b/test-server/worlds/world_generic/region/r.-1.-3.mca index 7eb87c2..13b2540 100755 Binary files a/test-server/worlds/world_generic/region/r.-1.-3.mca and b/test-server/worlds/world_generic/region/r.-1.-3.mca differ diff --git a/test-server/worlds/world_generic/region/r.-1.0.mca b/test-server/worlds/world_generic/region/r.-1.0.mca index 4ddacdf..7db1923 100755 Binary files a/test-server/worlds/world_generic/region/r.-1.0.mca and b/test-server/worlds/world_generic/region/r.-1.0.mca differ diff --git a/test-server/worlds/world_generic/region/r.-1.1.mca b/test-server/worlds/world_generic/region/r.-1.1.mca index 96deac1..6e7ca15 100755 Binary files a/test-server/worlds/world_generic/region/r.-1.1.mca and b/test-server/worlds/world_generic/region/r.-1.1.mca differ diff --git a/test-server/worlds/world_generic/region/r.-2.-1.mca b/test-server/worlds/world_generic/region/r.-2.-1.mca index 0d3d748..2055d55 100755 Binary files a/test-server/worlds/world_generic/region/r.-2.-1.mca and b/test-server/worlds/world_generic/region/r.-2.-1.mca differ diff --git a/test-server/worlds/world_generic/region/r.-2.-2.mca b/test-server/worlds/world_generic/region/r.-2.-2.mca index 9aaaea9..eaa7474 100755 Binary files a/test-server/worlds/world_generic/region/r.-2.-2.mca and b/test-server/worlds/world_generic/region/r.-2.-2.mca differ diff --git a/test-server/worlds/world_generic/region/r.-2.-3.mca b/test-server/worlds/world_generic/region/r.-2.-3.mca index efd004a..f8e2e8c 100755 Binary files a/test-server/worlds/world_generic/region/r.-2.-3.mca and b/test-server/worlds/world_generic/region/r.-2.-3.mca differ diff --git a/test-server/worlds/world_generic/region/r.-2.0.mca b/test-server/worlds/world_generic/region/r.-2.0.mca index c78fc2f..c90efaf 100755 Binary files a/test-server/worlds/world_generic/region/r.-2.0.mca and b/test-server/worlds/world_generic/region/r.-2.0.mca differ diff --git a/test-server/worlds/world_generic/region/r.-2.1.mca b/test-server/worlds/world_generic/region/r.-2.1.mca index 11d31c3..b223073 100755 Binary files a/test-server/worlds/world_generic/region/r.-2.1.mca and b/test-server/worlds/world_generic/region/r.-2.1.mca differ diff --git a/test-server/worlds/world_generic/region/r.0.-1.mca b/test-server/worlds/world_generic/region/r.0.-1.mca index 01b9072..1dae351 100755 Binary files a/test-server/worlds/world_generic/region/r.0.-1.mca and b/test-server/worlds/world_generic/region/r.0.-1.mca differ diff --git a/test-server/worlds/world_generic/region/r.0.-2.mca b/test-server/worlds/world_generic/region/r.0.-2.mca index f7e80ad..583b4ab 100755 Binary files a/test-server/worlds/world_generic/region/r.0.-2.mca and b/test-server/worlds/world_generic/region/r.0.-2.mca differ diff --git a/test-server/worlds/world_generic/region/r.0.-3.mca b/test-server/worlds/world_generic/region/r.0.-3.mca index 262ecdc..ed61e3b 100755 Binary files a/test-server/worlds/world_generic/region/r.0.-3.mca and b/test-server/worlds/world_generic/region/r.0.-3.mca differ diff --git a/test-server/worlds/world_generic/region/r.0.0.mca b/test-server/worlds/world_generic/region/r.0.0.mca index 01c7aa8..046e19c 100755 Binary files a/test-server/worlds/world_generic/region/r.0.0.mca and b/test-server/worlds/world_generic/region/r.0.0.mca differ diff --git a/test-server/worlds/world_generic/region/r.0.1.mca b/test-server/worlds/world_generic/region/r.0.1.mca index 12b2515..d27e1d5 100755 Binary files a/test-server/worlds/world_generic/region/r.0.1.mca and b/test-server/worlds/world_generic/region/r.0.1.mca differ diff --git a/test-server/worlds/world_generic/region/r.1.-1.mca b/test-server/worlds/world_generic/region/r.1.-1.mca index 92c235c..d385568 100755 Binary files a/test-server/worlds/world_generic/region/r.1.-1.mca and b/test-server/worlds/world_generic/region/r.1.-1.mca differ diff --git a/test-server/worlds/world_generic/region/r.1.-2.mca b/test-server/worlds/world_generic/region/r.1.-2.mca index 1ff2236..048bad5 100755 Binary files a/test-server/worlds/world_generic/region/r.1.-2.mca and b/test-server/worlds/world_generic/region/r.1.-2.mca differ diff --git a/test-server/worlds/world_generic/region/r.1.-3.mca b/test-server/worlds/world_generic/region/r.1.-3.mca index b6f8774..e64a9d6 100755 Binary files a/test-server/worlds/world_generic/region/r.1.-3.mca and b/test-server/worlds/world_generic/region/r.1.-3.mca differ diff --git a/test-server/worlds/world_generic/region/r.1.0.mca b/test-server/worlds/world_generic/region/r.1.0.mca index 8507495..18432d8 100755 Binary files a/test-server/worlds/world_generic/region/r.1.0.mca and b/test-server/worlds/world_generic/region/r.1.0.mca differ diff --git a/test-server/worlds/world_generic/region/r.1.1.mca b/test-server/worlds/world_generic/region/r.1.1.mca index 80213b4..9243cad 100755 Binary files a/test-server/worlds/world_generic/region/r.1.1.mca and b/test-server/worlds/world_generic/region/r.1.1.mca differ diff --git a/test-server/worlds/world_generic/region/r.1.2.mca b/test-server/worlds/world_generic/region/r.1.2.mca index 8f2e2c5..ba5aa0f 100755 Binary files a/test-server/worlds/world_generic/region/r.1.2.mca and b/test-server/worlds/world_generic/region/r.1.2.mca differ diff --git a/test-server/worlds/world_generic/region/r.1.3.mca b/test-server/worlds/world_generic/region/r.1.3.mca index 42545ba..b7d6052 100755 Binary files a/test-server/worlds/world_generic/region/r.1.3.mca and b/test-server/worlds/world_generic/region/r.1.3.mca differ diff --git a/test-server/worlds/world_generic/region/r.2.-1.mca b/test-server/worlds/world_generic/region/r.2.-1.mca index 0451b0e..d69ad0f 100755 Binary files a/test-server/worlds/world_generic/region/r.2.-1.mca and b/test-server/worlds/world_generic/region/r.2.-1.mca differ diff --git a/test-server/worlds/world_generic/region/r.2.-2.mca b/test-server/worlds/world_generic/region/r.2.-2.mca index d13965d..2283d43 100755 Binary files a/test-server/worlds/world_generic/region/r.2.-2.mca and b/test-server/worlds/world_generic/region/r.2.-2.mca differ diff --git a/test-server/worlds/world_generic/region/r.2.0.mca b/test-server/worlds/world_generic/region/r.2.0.mca index 4840420..bfed6d8 100755 Binary files a/test-server/worlds/world_generic/region/r.2.0.mca and b/test-server/worlds/world_generic/region/r.2.0.mca differ diff --git a/test-server/worlds/world_generic/region/r.2.1.mca b/test-server/worlds/world_generic/region/r.2.1.mca index 9105610..fc62142 100755 Binary files a/test-server/worlds/world_generic/region/r.2.1.mca and b/test-server/worlds/world_generic/region/r.2.1.mca differ diff --git a/test-server/worlds/world_generic/region/r.2.2.mca b/test-server/worlds/world_generic/region/r.2.2.mca index 7f54cea..209a8d2 100755 Binary files a/test-server/worlds/world_generic/region/r.2.2.mca and b/test-server/worlds/world_generic/region/r.2.2.mca differ diff --git a/test-server/worlds/world_generic/region/r.2.3.mca b/test-server/worlds/world_generic/region/r.2.3.mca index 092abff..0adec5c 100755 Binary files a/test-server/worlds/world_generic/region/r.2.3.mca and b/test-server/worlds/world_generic/region/r.2.3.mca differ diff --git a/test-server/worlds/world_generic/region/r.3.0.mca b/test-server/worlds/world_generic/region/r.3.0.mca index db44a8a..11f1472 100755 Binary files a/test-server/worlds/world_generic/region/r.3.0.mca and b/test-server/worlds/world_generic/region/r.3.0.mca differ diff --git a/worlds/halloween/entities/r.-1.-1.mca b/worlds/halloween/entities/r.-1.-1.mca index 8c045be..4603c7e 100755 Binary files a/worlds/halloween/entities/r.-1.-1.mca and b/worlds/halloween/entities/r.-1.-1.mca differ diff --git a/worlds/halloween/entities/r.-1.0.mca b/worlds/halloween/entities/r.-1.0.mca index 53ad9c4..fcbe70e 100755 Binary files a/worlds/halloween/entities/r.-1.0.mca and b/worlds/halloween/entities/r.-1.0.mca differ diff --git a/worlds/halloween/entities/r.0.-1.mca b/worlds/halloween/entities/r.0.-1.mca index 0481f7f..3c41ea6 100755 Binary files a/worlds/halloween/entities/r.0.-1.mca and b/worlds/halloween/entities/r.0.-1.mca differ diff --git a/worlds/halloween/entities/r.0.0.mca b/worlds/halloween/entities/r.0.0.mca index 05410e3..0074bb2 100755 Binary files a/worlds/halloween/entities/r.0.0.mca and b/worlds/halloween/entities/r.0.0.mca differ diff --git a/worlds/halloween/level.dat b/worlds/halloween/level.dat index c07334e..b8b24bb 100644 Binary files a/worlds/halloween/level.dat and b/worlds/halloween/level.dat differ diff --git a/worlds/halloween/level.dat_old b/worlds/halloween/level.dat_old index e956d7f..4060709 100644 Binary files a/worlds/halloween/level.dat_old and b/worlds/halloween/level.dat_old differ diff --git a/worlds/halloween/poi/r.-1.-1.mca b/worlds/halloween/poi/r.-1.-1.mca index 5fef72f..4e1fff6 100755 Binary files a/worlds/halloween/poi/r.-1.-1.mca and b/worlds/halloween/poi/r.-1.-1.mca differ diff --git a/worlds/halloween/poi/r.-1.0.mca b/worlds/halloween/poi/r.-1.0.mca index 4fbd8fd..cc58ba0 100755 Binary files a/worlds/halloween/poi/r.-1.0.mca and b/worlds/halloween/poi/r.-1.0.mca differ diff --git a/worlds/halloween/poi/r.0.-1.mca b/worlds/halloween/poi/r.0.-1.mca index 4ba530b..046091c 100755 Binary files a/worlds/halloween/poi/r.0.-1.mca and b/worlds/halloween/poi/r.0.-1.mca differ diff --git a/worlds/halloween/poi/r.0.0.mca b/worlds/halloween/poi/r.0.0.mca index b791761..4254849 100755 Binary files a/worlds/halloween/poi/r.0.0.mca and b/worlds/halloween/poi/r.0.0.mca differ diff --git a/worlds/halloween/region/r.-1.-1.mca b/worlds/halloween/region/r.-1.-1.mca index 4d2313f..60802b8 100755 Binary files a/worlds/halloween/region/r.-1.-1.mca and b/worlds/halloween/region/r.-1.-1.mca differ diff --git a/worlds/halloween/region/r.-1.-2.mca b/worlds/halloween/region/r.-1.-2.mca index 551f56d..58fe89f 100755 Binary files a/worlds/halloween/region/r.-1.-2.mca and b/worlds/halloween/region/r.-1.-2.mca differ diff --git a/worlds/halloween/region/r.-1.-3.mca b/worlds/halloween/region/r.-1.-3.mca index 7eb87c2..d60e907 100755 Binary files a/worlds/halloween/region/r.-1.-3.mca and b/worlds/halloween/region/r.-1.-3.mca differ diff --git a/worlds/halloween/region/r.-1.0.mca b/worlds/halloween/region/r.-1.0.mca index 749c803..cbc897c 100755 Binary files a/worlds/halloween/region/r.-1.0.mca and b/worlds/halloween/region/r.-1.0.mca differ diff --git a/worlds/halloween/region/r.-1.1.mca b/worlds/halloween/region/r.-1.1.mca index 19a5b7a..25fe8c0 100755 Binary files a/worlds/halloween/region/r.-1.1.mca and b/worlds/halloween/region/r.-1.1.mca differ diff --git a/worlds/halloween/region/r.-2.-1.mca b/worlds/halloween/region/r.-2.-1.mca index eee449b..7d4a447 100755 Binary files a/worlds/halloween/region/r.-2.-1.mca and b/worlds/halloween/region/r.-2.-1.mca differ diff --git a/worlds/halloween/region/r.-2.-2.mca b/worlds/halloween/region/r.-2.-2.mca index dd0daeb..e995108 100755 Binary files a/worlds/halloween/region/r.-2.-2.mca and b/worlds/halloween/region/r.-2.-2.mca differ diff --git a/worlds/halloween/region/r.-2.-3.mca b/worlds/halloween/region/r.-2.-3.mca index efd004a..f89bf18 100755 Binary files a/worlds/halloween/region/r.-2.-3.mca and b/worlds/halloween/region/r.-2.-3.mca differ diff --git a/worlds/halloween/region/r.-2.0.mca b/worlds/halloween/region/r.-2.0.mca index 20e3275..12b4fb9 100755 Binary files a/worlds/halloween/region/r.-2.0.mca and b/worlds/halloween/region/r.-2.0.mca differ diff --git a/worlds/halloween/region/r.-2.1.mca b/worlds/halloween/region/r.-2.1.mca index ff238dc..fb737a5 100755 Binary files a/worlds/halloween/region/r.-2.1.mca and b/worlds/halloween/region/r.-2.1.mca differ diff --git a/worlds/halloween/region/r.0.-1.mca b/worlds/halloween/region/r.0.-1.mca index 1c46200..43f81ed 100755 Binary files a/worlds/halloween/region/r.0.-1.mca and b/worlds/halloween/region/r.0.-1.mca differ diff --git a/worlds/halloween/region/r.0.-2.mca b/worlds/halloween/region/r.0.-2.mca index de9273f..089cdc5 100755 Binary files a/worlds/halloween/region/r.0.-2.mca and b/worlds/halloween/region/r.0.-2.mca differ diff --git a/worlds/halloween/region/r.0.-3.mca b/worlds/halloween/region/r.0.-3.mca index 262ecdc..6fcf042 100755 Binary files a/worlds/halloween/region/r.0.-3.mca and b/worlds/halloween/region/r.0.-3.mca differ diff --git a/worlds/halloween/region/r.0.0.mca b/worlds/halloween/region/r.0.0.mca index 01f5056..be1d841 100755 Binary files a/worlds/halloween/region/r.0.0.mca and b/worlds/halloween/region/r.0.0.mca differ diff --git a/worlds/halloween/region/r.0.1.mca b/worlds/halloween/region/r.0.1.mca index 940cc56..16b6b5a 100755 Binary files a/worlds/halloween/region/r.0.1.mca and b/worlds/halloween/region/r.0.1.mca differ diff --git a/worlds/halloween/region/r.1.-1.mca b/worlds/halloween/region/r.1.-1.mca index e8bd365..1f4fcf2 100755 Binary files a/worlds/halloween/region/r.1.-1.mca and b/worlds/halloween/region/r.1.-1.mca differ diff --git a/worlds/halloween/region/r.1.-2.mca b/worlds/halloween/region/r.1.-2.mca index 70ee1c9..5c32678 100755 Binary files a/worlds/halloween/region/r.1.-2.mca and b/worlds/halloween/region/r.1.-2.mca differ diff --git a/worlds/halloween/region/r.1.-3.mca b/worlds/halloween/region/r.1.-3.mca index b6f8774..b02878a 100755 Binary files a/worlds/halloween/region/r.1.-3.mca and b/worlds/halloween/region/r.1.-3.mca differ diff --git a/worlds/halloween/region/r.1.0.mca b/worlds/halloween/region/r.1.0.mca index 72ebde4..afcbc70 100755 Binary files a/worlds/halloween/region/r.1.0.mca and b/worlds/halloween/region/r.1.0.mca differ diff --git a/worlds/halloween/region/r.1.1.mca b/worlds/halloween/region/r.1.1.mca index b4bde0f..ea25a5c 100755 Binary files a/worlds/halloween/region/r.1.1.mca and b/worlds/halloween/region/r.1.1.mca differ diff --git a/worlds/halloween/region/r.1.2.mca b/worlds/halloween/region/r.1.2.mca index 8f2e2c5..9998345 100755 Binary files a/worlds/halloween/region/r.1.2.mca and b/worlds/halloween/region/r.1.2.mca differ diff --git a/worlds/halloween/region/r.1.3.mca b/worlds/halloween/region/r.1.3.mca index 42545ba..5d19895 100755 Binary files a/worlds/halloween/region/r.1.3.mca and b/worlds/halloween/region/r.1.3.mca differ diff --git a/worlds/halloween/region/r.2.-1.mca b/worlds/halloween/region/r.2.-1.mca index 0451b0e..c099dd5 100755 Binary files a/worlds/halloween/region/r.2.-1.mca and b/worlds/halloween/region/r.2.-1.mca differ diff --git a/worlds/halloween/region/r.2.-2.mca b/worlds/halloween/region/r.2.-2.mca index d13965d..b7fc32d 100755 Binary files a/worlds/halloween/region/r.2.-2.mca and b/worlds/halloween/region/r.2.-2.mca differ diff --git a/worlds/halloween/region/r.2.0.mca b/worlds/halloween/region/r.2.0.mca index 4840420..9eab2e9 100755 Binary files a/worlds/halloween/region/r.2.0.mca and b/worlds/halloween/region/r.2.0.mca differ diff --git a/worlds/halloween/region/r.2.1.mca b/worlds/halloween/region/r.2.1.mca index 9105610..3406ec5 100755 Binary files a/worlds/halloween/region/r.2.1.mca and b/worlds/halloween/region/r.2.1.mca differ diff --git a/worlds/halloween/region/r.2.2.mca b/worlds/halloween/region/r.2.2.mca index 7f54cea..3b8cf53 100755 Binary files a/worlds/halloween/region/r.2.2.mca and b/worlds/halloween/region/r.2.2.mca differ diff --git a/worlds/halloween/region/r.2.3.mca b/worlds/halloween/region/r.2.3.mca index 092abff..a73ce6f 100755 Binary files a/worlds/halloween/region/r.2.3.mca and b/worlds/halloween/region/r.2.3.mca differ diff --git a/worlds/halloween/region/r.3.0.mca b/worlds/halloween/region/r.3.0.mca index db44a8a..649b22f 100755 Binary files a/worlds/halloween/region/r.3.0.mca and b/worlds/halloween/region/r.3.0.mca differ diff --git a/worlds/winter/entities/r.-1.-1.mca b/worlds/winter/entities/r.-1.-1.mca index 04f16c7..b30beda 100755 Binary files a/worlds/winter/entities/r.-1.-1.mca and b/worlds/winter/entities/r.-1.-1.mca differ diff --git a/worlds/winter/entities/r.-1.0.mca b/worlds/winter/entities/r.-1.0.mca index 39631c3..fa56bc5 100755 Binary files a/worlds/winter/entities/r.-1.0.mca and b/worlds/winter/entities/r.-1.0.mca differ diff --git a/worlds/winter/entities/r.0.-1.mca b/worlds/winter/entities/r.0.-1.mca index c28dd5a..15d1633 100755 Binary files a/worlds/winter/entities/r.0.-1.mca and b/worlds/winter/entities/r.0.-1.mca differ diff --git a/worlds/winter/entities/r.0.0.mca b/worlds/winter/entities/r.0.0.mca index f7b7754..2c687d0 100755 Binary files a/worlds/winter/entities/r.0.0.mca and b/worlds/winter/entities/r.0.0.mca differ diff --git a/worlds/winter/level.dat b/worlds/winter/level.dat index f258386..7cf4288 100644 Binary files a/worlds/winter/level.dat and b/worlds/winter/level.dat differ diff --git a/worlds/winter/level.dat_old b/worlds/winter/level.dat_old index 85fb554..37cd6a7 100644 Binary files a/worlds/winter/level.dat_old and b/worlds/winter/level.dat_old differ diff --git a/worlds/winter/poi/r.-1.-1.mca b/worlds/winter/poi/r.-1.-1.mca index 5fef72f..3d35eee 100755 Binary files a/worlds/winter/poi/r.-1.-1.mca and b/worlds/winter/poi/r.-1.-1.mca differ diff --git a/worlds/winter/poi/r.-1.0.mca b/worlds/winter/poi/r.-1.0.mca index c4e580e..cfe61bb 100755 Binary files a/worlds/winter/poi/r.-1.0.mca and b/worlds/winter/poi/r.-1.0.mca differ diff --git a/worlds/winter/poi/r.0.-1.mca b/worlds/winter/poi/r.0.-1.mca index 9a65ecb..87c5547 100755 Binary files a/worlds/winter/poi/r.0.-1.mca and b/worlds/winter/poi/r.0.-1.mca differ diff --git a/worlds/winter/poi/r.0.0.mca b/worlds/winter/poi/r.0.0.mca index eac04b0..068f19d 100755 Binary files a/worlds/winter/poi/r.0.0.mca and b/worlds/winter/poi/r.0.0.mca differ diff --git a/worlds/winter/region/r.-1.-1.mca b/worlds/winter/region/r.-1.-1.mca index 69df59a..7540fb3 100755 Binary files a/worlds/winter/region/r.-1.-1.mca and b/worlds/winter/region/r.-1.-1.mca differ diff --git a/worlds/winter/region/r.-1.-2.mca b/worlds/winter/region/r.-1.-2.mca index 9485e61..9c14e92 100755 Binary files a/worlds/winter/region/r.-1.-2.mca and b/worlds/winter/region/r.-1.-2.mca differ diff --git a/worlds/winter/region/r.-1.-3.mca b/worlds/winter/region/r.-1.-3.mca index 7eb87c2..dc9c279 100755 Binary files a/worlds/winter/region/r.-1.-3.mca and b/worlds/winter/region/r.-1.-3.mca differ diff --git a/worlds/winter/region/r.-1.0.mca b/worlds/winter/region/r.-1.0.mca index 56eaa97..41a780f 100755 Binary files a/worlds/winter/region/r.-1.0.mca and b/worlds/winter/region/r.-1.0.mca differ diff --git a/worlds/winter/region/r.-1.1.mca b/worlds/winter/region/r.-1.1.mca index 47bf42b..3437927 100755 Binary files a/worlds/winter/region/r.-1.1.mca and b/worlds/winter/region/r.-1.1.mca differ diff --git a/worlds/winter/region/r.-2.-1.mca b/worlds/winter/region/r.-2.-1.mca index c610dea..3797826 100755 Binary files a/worlds/winter/region/r.-2.-1.mca and b/worlds/winter/region/r.-2.-1.mca differ diff --git a/worlds/winter/region/r.-2.-2.mca b/worlds/winter/region/r.-2.-2.mca index ea127b6..9bb67df 100755 Binary files a/worlds/winter/region/r.-2.-2.mca and b/worlds/winter/region/r.-2.-2.mca differ diff --git a/worlds/winter/region/r.-2.-3.mca b/worlds/winter/region/r.-2.-3.mca index efd004a..0ad48df 100755 Binary files a/worlds/winter/region/r.-2.-3.mca and b/worlds/winter/region/r.-2.-3.mca differ diff --git a/worlds/winter/region/r.-2.0.mca b/worlds/winter/region/r.-2.0.mca index 6dbad8d..7414b01 100755 Binary files a/worlds/winter/region/r.-2.0.mca and b/worlds/winter/region/r.-2.0.mca differ diff --git a/worlds/winter/region/r.-2.1.mca b/worlds/winter/region/r.-2.1.mca index 635f736..08046d6 100755 Binary files a/worlds/winter/region/r.-2.1.mca and b/worlds/winter/region/r.-2.1.mca differ diff --git a/worlds/winter/region/r.0.-1.mca b/worlds/winter/region/r.0.-1.mca index cb9ba76..c2b0608 100755 Binary files a/worlds/winter/region/r.0.-1.mca and b/worlds/winter/region/r.0.-1.mca differ diff --git a/worlds/winter/region/r.0.-2.mca b/worlds/winter/region/r.0.-2.mca index bc7cf4e..6d1d174 100755 Binary files a/worlds/winter/region/r.0.-2.mca and b/worlds/winter/region/r.0.-2.mca differ diff --git a/worlds/winter/region/r.0.-3.mca b/worlds/winter/region/r.0.-3.mca index 262ecdc..78887f1 100755 Binary files a/worlds/winter/region/r.0.-3.mca and b/worlds/winter/region/r.0.-3.mca differ diff --git a/worlds/winter/region/r.0.0.mca b/worlds/winter/region/r.0.0.mca index 8484738..b63272a 100755 Binary files a/worlds/winter/region/r.0.0.mca and b/worlds/winter/region/r.0.0.mca differ diff --git a/worlds/winter/region/r.0.1.mca b/worlds/winter/region/r.0.1.mca index 5684473..636c6a3 100755 Binary files a/worlds/winter/region/r.0.1.mca and b/worlds/winter/region/r.0.1.mca differ diff --git a/worlds/winter/region/r.1.-1.mca b/worlds/winter/region/r.1.-1.mca index 94d68e2..731ad59 100755 Binary files a/worlds/winter/region/r.1.-1.mca and b/worlds/winter/region/r.1.-1.mca differ diff --git a/worlds/winter/region/r.1.-2.mca b/worlds/winter/region/r.1.-2.mca index 004f6c3..a2fffff 100755 Binary files a/worlds/winter/region/r.1.-2.mca and b/worlds/winter/region/r.1.-2.mca differ diff --git a/worlds/winter/region/r.1.-3.mca b/worlds/winter/region/r.1.-3.mca index b6f8774..1dc9b4e 100755 Binary files a/worlds/winter/region/r.1.-3.mca and b/worlds/winter/region/r.1.-3.mca differ diff --git a/worlds/winter/region/r.1.0.mca b/worlds/winter/region/r.1.0.mca index 982b711..b0a4c4a 100755 Binary files a/worlds/winter/region/r.1.0.mca and b/worlds/winter/region/r.1.0.mca differ diff --git a/worlds/winter/region/r.1.1.mca b/worlds/winter/region/r.1.1.mca index 805ab85..9a2fe3c 100755 Binary files a/worlds/winter/region/r.1.1.mca and b/worlds/winter/region/r.1.1.mca differ diff --git a/worlds/winter/region/r.1.2.mca b/worlds/winter/region/r.1.2.mca index a02f6b1..7a30555 100755 Binary files a/worlds/winter/region/r.1.2.mca and b/worlds/winter/region/r.1.2.mca differ diff --git a/worlds/winter/region/r.1.3.mca b/worlds/winter/region/r.1.3.mca index 42545ba..925d39b 100755 Binary files a/worlds/winter/region/r.1.3.mca and b/worlds/winter/region/r.1.3.mca differ diff --git a/worlds/winter/region/r.2.-1.mca b/worlds/winter/region/r.2.-1.mca index 0451b0e..5f066f8 100755 Binary files a/worlds/winter/region/r.2.-1.mca and b/worlds/winter/region/r.2.-1.mca differ diff --git a/worlds/winter/region/r.2.-2.mca b/worlds/winter/region/r.2.-2.mca index d13965d..8ac8bce 100755 Binary files a/worlds/winter/region/r.2.-2.mca and b/worlds/winter/region/r.2.-2.mca differ diff --git a/worlds/winter/region/r.2.0.mca b/worlds/winter/region/r.2.0.mca index 4840420..6201b44 100755 Binary files a/worlds/winter/region/r.2.0.mca and b/worlds/winter/region/r.2.0.mca differ diff --git a/worlds/winter/region/r.2.1.mca b/worlds/winter/region/r.2.1.mca index bf31d21..b896131 100755 Binary files a/worlds/winter/region/r.2.1.mca and b/worlds/winter/region/r.2.1.mca differ diff --git a/worlds/winter/region/r.2.2.mca b/worlds/winter/region/r.2.2.mca index cdf5bf7..848a6be 100755 Binary files a/worlds/winter/region/r.2.2.mca and b/worlds/winter/region/r.2.2.mca differ diff --git a/worlds/winter/region/r.2.3.mca b/worlds/winter/region/r.2.3.mca index 092abff..d225e5f 100755 Binary files a/worlds/winter/region/r.2.3.mca and b/worlds/winter/region/r.2.3.mca differ diff --git a/worlds/winter/region/r.3.0.mca b/worlds/winter/region/r.3.0.mca index db44a8a..cdc46ac 100755 Binary files a/worlds/winter/region/r.3.0.mca and b/worlds/winter/region/r.3.0.mca differ diff --git a/worlds/world/level.dat b/worlds/world/level.dat index f7bbba4..927c9cf 100644 Binary files a/worlds/world/level.dat and b/worlds/world/level.dat differ diff --git a/worlds/world/level.dat_old b/worlds/world/level.dat_old index f7bbba4..cef5684 100644 Binary files a/worlds/world/level.dat_old and b/worlds/world/level.dat_old differ diff --git a/worlds/world/poi/r.-1.-1.mca b/worlds/world/poi/r.-1.-1.mca index e9d8685..5f9ca32 100755 Binary files a/worlds/world/poi/r.-1.-1.mca and b/worlds/world/poi/r.-1.-1.mca differ diff --git a/worlds/world/poi/r.-1.0.mca b/worlds/world/poi/r.-1.0.mca index 4638782..f0e4c2d 100755 Binary files a/worlds/world/poi/r.-1.0.mca and b/worlds/world/poi/r.-1.0.mca differ diff --git a/worlds/world/poi/r.0.-1.mca b/worlds/world/poi/r.0.-1.mca index 9a65ecb..c870874 100755 Binary files a/worlds/world/poi/r.0.-1.mca and b/worlds/world/poi/r.0.-1.mca differ diff --git a/worlds/world/poi/r.0.0.mca b/worlds/world/poi/r.0.0.mca index dd14694..1b6b33a 100755 Binary files a/worlds/world/poi/r.0.0.mca and b/worlds/world/poi/r.0.0.mca differ diff --git a/worlds/world/region/r.-1.-1.mca b/worlds/world/region/r.-1.-1.mca index 337f2be..5e8d0d2 100755 Binary files a/worlds/world/region/r.-1.-1.mca and b/worlds/world/region/r.-1.-1.mca differ diff --git a/worlds/world/region/r.-1.-2.mca b/worlds/world/region/r.-1.-2.mca index 4f1e391..906319a 100755 Binary files a/worlds/world/region/r.-1.-2.mca and b/worlds/world/region/r.-1.-2.mca differ diff --git a/worlds/world/region/r.-1.-3.mca b/worlds/world/region/r.-1.-3.mca index 7eb87c2..a06c509 100755 Binary files a/worlds/world/region/r.-1.-3.mca and b/worlds/world/region/r.-1.-3.mca differ diff --git a/worlds/world/region/r.-1.0.mca b/worlds/world/region/r.-1.0.mca index 50d1606..34c7bcd 100755 Binary files a/worlds/world/region/r.-1.0.mca and b/worlds/world/region/r.-1.0.mca differ diff --git a/worlds/world/region/r.-1.1.mca b/worlds/world/region/r.-1.1.mca index d99a754..ed412a9 100755 Binary files a/worlds/world/region/r.-1.1.mca and b/worlds/world/region/r.-1.1.mca differ diff --git a/worlds/world/region/r.-1.2.mca b/worlds/world/region/r.-1.2.mca index 0d73971..1bfb8e3 100644 Binary files a/worlds/world/region/r.-1.2.mca and b/worlds/world/region/r.-1.2.mca differ diff --git a/worlds/world/region/r.-2.-1.mca b/worlds/world/region/r.-2.-1.mca index 751442b..a1d97bf 100755 Binary files a/worlds/world/region/r.-2.-1.mca and b/worlds/world/region/r.-2.-1.mca differ diff --git a/worlds/world/region/r.-2.-2.mca b/worlds/world/region/r.-2.-2.mca index 3e5c015..70dfbf3 100755 Binary files a/worlds/world/region/r.-2.-2.mca and b/worlds/world/region/r.-2.-2.mca differ diff --git a/worlds/world/region/r.-2.-3.mca b/worlds/world/region/r.-2.-3.mca index efd004a..d4c73ee 100755 Binary files a/worlds/world/region/r.-2.-3.mca and b/worlds/world/region/r.-2.-3.mca differ diff --git a/worlds/world/region/r.-2.0.mca b/worlds/world/region/r.-2.0.mca index 0b842b7..2077957 100755 Binary files a/worlds/world/region/r.-2.0.mca and b/worlds/world/region/r.-2.0.mca differ diff --git a/worlds/world/region/r.-2.1.mca b/worlds/world/region/r.-2.1.mca index 252bd74..d9dd381 100755 Binary files a/worlds/world/region/r.-2.1.mca and b/worlds/world/region/r.-2.1.mca differ diff --git a/worlds/world/region/r.0.-1.mca b/worlds/world/region/r.0.-1.mca index 3d35397..4b9ddc2 100755 Binary files a/worlds/world/region/r.0.-1.mca and b/worlds/world/region/r.0.-1.mca differ diff --git a/worlds/world/region/r.0.-2.mca b/worlds/world/region/r.0.-2.mca index cdf5654..6e896c6 100755 Binary files a/worlds/world/region/r.0.-2.mca and b/worlds/world/region/r.0.-2.mca differ diff --git a/worlds/world/region/r.0.-3.mca b/worlds/world/region/r.0.-3.mca index 1016159..5a93454 100755 Binary files a/worlds/world/region/r.0.-3.mca and b/worlds/world/region/r.0.-3.mca differ diff --git a/worlds/world/region/r.0.-4.mca b/worlds/world/region/r.0.-4.mca index 55db040..c2a4881 100644 Binary files a/worlds/world/region/r.0.-4.mca and b/worlds/world/region/r.0.-4.mca differ diff --git a/worlds/world/region/r.0.0.mca b/worlds/world/region/r.0.0.mca index 089cf13..bd9b79f 100755 Binary files a/worlds/world/region/r.0.0.mca and b/worlds/world/region/r.0.0.mca differ diff --git a/worlds/world/region/r.0.1.mca b/worlds/world/region/r.0.1.mca index 22c7ee0..3a9792d 100755 Binary files a/worlds/world/region/r.0.1.mca and b/worlds/world/region/r.0.1.mca differ diff --git a/worlds/world/region/r.0.2.mca b/worlds/world/region/r.0.2.mca index 6e5b496..d19ff13 100644 Binary files a/worlds/world/region/r.0.2.mca and b/worlds/world/region/r.0.2.mca differ diff --git a/worlds/world/region/r.1.-1.mca b/worlds/world/region/r.1.-1.mca index c9cf3fb..cb02f4f 100755 Binary files a/worlds/world/region/r.1.-1.mca and b/worlds/world/region/r.1.-1.mca differ diff --git a/worlds/world/region/r.1.-2.mca b/worlds/world/region/r.1.-2.mca index 6cb864f..7b7fd87 100755 Binary files a/worlds/world/region/r.1.-2.mca and b/worlds/world/region/r.1.-2.mca differ diff --git a/worlds/world/region/r.1.-3.mca b/worlds/world/region/r.1.-3.mca index b6f8774..f353802 100755 Binary files a/worlds/world/region/r.1.-3.mca and b/worlds/world/region/r.1.-3.mca differ diff --git a/worlds/world/region/r.1.0.mca b/worlds/world/region/r.1.0.mca index c7014db..d34f3bb 100755 Binary files a/worlds/world/region/r.1.0.mca and b/worlds/world/region/r.1.0.mca differ diff --git a/worlds/world/region/r.1.1.mca b/worlds/world/region/r.1.1.mca index db99c9b..f7b80b3 100755 Binary files a/worlds/world/region/r.1.1.mca and b/worlds/world/region/r.1.1.mca differ diff --git a/worlds/world/region/r.1.2.mca b/worlds/world/region/r.1.2.mca index ca57153..0c1bd17 100755 Binary files a/worlds/world/region/r.1.2.mca and b/worlds/world/region/r.1.2.mca differ diff --git a/worlds/world/region/r.1.3.mca b/worlds/world/region/r.1.3.mca index 42545ba..592a2e5 100755 Binary files a/worlds/world/region/r.1.3.mca and b/worlds/world/region/r.1.3.mca differ diff --git a/worlds/world/region/r.2.-1.mca b/worlds/world/region/r.2.-1.mca index 0451b0e..8ded42c 100755 Binary files a/worlds/world/region/r.2.-1.mca and b/worlds/world/region/r.2.-1.mca differ diff --git a/worlds/world/region/r.2.-2.mca b/worlds/world/region/r.2.-2.mca index d13965d..084ddcb 100755 Binary files a/worlds/world/region/r.2.-2.mca and b/worlds/world/region/r.2.-2.mca differ diff --git a/worlds/world/region/r.2.0.mca b/worlds/world/region/r.2.0.mca index 4840420..89391f1 100755 Binary files a/worlds/world/region/r.2.0.mca and b/worlds/world/region/r.2.0.mca differ diff --git a/worlds/world/region/r.2.1.mca b/worlds/world/region/r.2.1.mca index 88dd949..94d4e67 100755 Binary files a/worlds/world/region/r.2.1.mca and b/worlds/world/region/r.2.1.mca differ diff --git a/worlds/world/region/r.2.2.mca b/worlds/world/region/r.2.2.mca index 4f7776d..b6ad2f0 100755 Binary files a/worlds/world/region/r.2.2.mca and b/worlds/world/region/r.2.2.mca differ diff --git a/worlds/world/region/r.2.3.mca b/worlds/world/region/r.2.3.mca index 092abff..0c2cb5b 100755 Binary files a/worlds/world/region/r.2.3.mca and b/worlds/world/region/r.2.3.mca differ diff --git a/worlds/world/region/r.3.0.mca b/worlds/world/region/r.3.0.mca index db44a8a..8cda4c6 100755 Binary files a/worlds/world/region/r.3.0.mca and b/worlds/world/region/r.3.0.mca differ diff --git a/worlds/world_generic/entities/r.-1.-1.mca b/worlds/world_generic/entities/r.-1.-1.mca index ab72ff2..3ba576b 100755 Binary files a/worlds/world_generic/entities/r.-1.-1.mca and b/worlds/world_generic/entities/r.-1.-1.mca differ diff --git a/worlds/world_generic/entities/r.-1.0.mca b/worlds/world_generic/entities/r.-1.0.mca index 83105d7..a91a214 100755 Binary files a/worlds/world_generic/entities/r.-1.0.mca and b/worlds/world_generic/entities/r.-1.0.mca differ diff --git a/worlds/world_generic/entities/r.0.-1.mca b/worlds/world_generic/entities/r.0.-1.mca index 27766b0..8dfd59e 100755 Binary files a/worlds/world_generic/entities/r.0.-1.mca and b/worlds/world_generic/entities/r.0.-1.mca differ diff --git a/worlds/world_generic/entities/r.0.0.mca b/worlds/world_generic/entities/r.0.0.mca index 0c17571..49b5ee1 100755 Binary files a/worlds/world_generic/entities/r.0.0.mca and b/worlds/world_generic/entities/r.0.0.mca differ diff --git a/worlds/world_generic/level.dat b/worlds/world_generic/level.dat index 5fc2eb9..e985dbf 100755 Binary files a/worlds/world_generic/level.dat and b/worlds/world_generic/level.dat differ diff --git a/worlds/world_generic/level.dat_old b/worlds/world_generic/level.dat_old index de762b1..138bc0f 100755 Binary files a/worlds/world_generic/level.dat_old and b/worlds/world_generic/level.dat_old differ diff --git a/worlds/world_generic/poi/r.-1.-1.mca b/worlds/world_generic/poi/r.-1.-1.mca index 672492c..74f0dcf 100755 Binary files a/worlds/world_generic/poi/r.-1.-1.mca and b/worlds/world_generic/poi/r.-1.-1.mca differ diff --git a/worlds/world_generic/poi/r.-1.0.mca b/worlds/world_generic/poi/r.-1.0.mca index 62b4fda..a9bf344 100755 Binary files a/worlds/world_generic/poi/r.-1.0.mca and b/worlds/world_generic/poi/r.-1.0.mca differ diff --git a/worlds/world_generic/poi/r.0.-1.mca b/worlds/world_generic/poi/r.0.-1.mca index 197dfc9..35e3a2a 100755 Binary files a/worlds/world_generic/poi/r.0.-1.mca and b/worlds/world_generic/poi/r.0.-1.mca differ diff --git a/worlds/world_generic/poi/r.0.0.mca b/worlds/world_generic/poi/r.0.0.mca index ebb25ad..0b7a7f9 100755 Binary files a/worlds/world_generic/poi/r.0.0.mca and b/worlds/world_generic/poi/r.0.0.mca differ diff --git a/worlds/world_generic/region/r.-1.-1.mca b/worlds/world_generic/region/r.-1.-1.mca index aedc1ba..dbaf95e 100755 Binary files a/worlds/world_generic/region/r.-1.-1.mca and b/worlds/world_generic/region/r.-1.-1.mca differ diff --git a/worlds/world_generic/region/r.-1.-2.mca b/worlds/world_generic/region/r.-1.-2.mca index b84a062..a9590ff 100755 Binary files a/worlds/world_generic/region/r.-1.-2.mca and b/worlds/world_generic/region/r.-1.-2.mca differ diff --git a/worlds/world_generic/region/r.-1.-3.mca b/worlds/world_generic/region/r.-1.-3.mca index 7eb87c2..9cca0dd 100755 Binary files a/worlds/world_generic/region/r.-1.-3.mca and b/worlds/world_generic/region/r.-1.-3.mca differ diff --git a/worlds/world_generic/region/r.-1.0.mca b/worlds/world_generic/region/r.-1.0.mca index 4ddacdf..bf2e450 100755 Binary files a/worlds/world_generic/region/r.-1.0.mca and b/worlds/world_generic/region/r.-1.0.mca differ diff --git a/worlds/world_generic/region/r.-1.1.mca b/worlds/world_generic/region/r.-1.1.mca index 96deac1..53a97f4 100755 Binary files a/worlds/world_generic/region/r.-1.1.mca and b/worlds/world_generic/region/r.-1.1.mca differ diff --git a/worlds/world_generic/region/r.-2.-1.mca b/worlds/world_generic/region/r.-2.-1.mca index 0d3d748..a3b5952 100755 Binary files a/worlds/world_generic/region/r.-2.-1.mca and b/worlds/world_generic/region/r.-2.-1.mca differ diff --git a/worlds/world_generic/region/r.-2.-2.mca b/worlds/world_generic/region/r.-2.-2.mca index 9aaaea9..5951690 100755 Binary files a/worlds/world_generic/region/r.-2.-2.mca and b/worlds/world_generic/region/r.-2.-2.mca differ diff --git a/worlds/world_generic/region/r.-2.-3.mca b/worlds/world_generic/region/r.-2.-3.mca index efd004a..d8a8a4e 100755 Binary files a/worlds/world_generic/region/r.-2.-3.mca and b/worlds/world_generic/region/r.-2.-3.mca differ diff --git a/worlds/world_generic/region/r.-2.0.mca b/worlds/world_generic/region/r.-2.0.mca index c78fc2f..00c10fc 100755 Binary files a/worlds/world_generic/region/r.-2.0.mca and b/worlds/world_generic/region/r.-2.0.mca differ diff --git a/worlds/world_generic/region/r.-2.1.mca b/worlds/world_generic/region/r.-2.1.mca index 11d31c3..e97b476 100755 Binary files a/worlds/world_generic/region/r.-2.1.mca and b/worlds/world_generic/region/r.-2.1.mca differ diff --git a/worlds/world_generic/region/r.0.-1.mca b/worlds/world_generic/region/r.0.-1.mca index 01b9072..6f90523 100755 Binary files a/worlds/world_generic/region/r.0.-1.mca and b/worlds/world_generic/region/r.0.-1.mca differ diff --git a/worlds/world_generic/region/r.0.-2.mca b/worlds/world_generic/region/r.0.-2.mca index f7e80ad..21dc62d 100755 Binary files a/worlds/world_generic/region/r.0.-2.mca and b/worlds/world_generic/region/r.0.-2.mca differ diff --git a/worlds/world_generic/region/r.0.-3.mca b/worlds/world_generic/region/r.0.-3.mca index 262ecdc..880d67f 100755 Binary files a/worlds/world_generic/region/r.0.-3.mca and b/worlds/world_generic/region/r.0.-3.mca differ diff --git a/worlds/world_generic/region/r.0.0.mca b/worlds/world_generic/region/r.0.0.mca index 01c7aa8..fc3b630 100755 Binary files a/worlds/world_generic/region/r.0.0.mca and b/worlds/world_generic/region/r.0.0.mca differ diff --git a/worlds/world_generic/region/r.0.1.mca b/worlds/world_generic/region/r.0.1.mca index 12b2515..f8250ea 100755 Binary files a/worlds/world_generic/region/r.0.1.mca and b/worlds/world_generic/region/r.0.1.mca differ diff --git a/worlds/world_generic/region/r.1.-1.mca b/worlds/world_generic/region/r.1.-1.mca index 92c235c..f12e86c 100755 Binary files a/worlds/world_generic/region/r.1.-1.mca and b/worlds/world_generic/region/r.1.-1.mca differ diff --git a/worlds/world_generic/region/r.1.-2.mca b/worlds/world_generic/region/r.1.-2.mca index 1ff2236..6a1812f 100755 Binary files a/worlds/world_generic/region/r.1.-2.mca and b/worlds/world_generic/region/r.1.-2.mca differ diff --git a/worlds/world_generic/region/r.1.-3.mca b/worlds/world_generic/region/r.1.-3.mca index b6f8774..4205721 100755 Binary files a/worlds/world_generic/region/r.1.-3.mca and b/worlds/world_generic/region/r.1.-3.mca differ diff --git a/worlds/world_generic/region/r.1.0.mca b/worlds/world_generic/region/r.1.0.mca index 8507495..5f6a26b 100755 Binary files a/worlds/world_generic/region/r.1.0.mca and b/worlds/world_generic/region/r.1.0.mca differ diff --git a/worlds/world_generic/region/r.1.1.mca b/worlds/world_generic/region/r.1.1.mca index 80213b4..a0a8cd9 100755 Binary files a/worlds/world_generic/region/r.1.1.mca and b/worlds/world_generic/region/r.1.1.mca differ diff --git a/worlds/world_generic/region/r.1.2.mca b/worlds/world_generic/region/r.1.2.mca index 8f2e2c5..ad451bf 100755 Binary files a/worlds/world_generic/region/r.1.2.mca and b/worlds/world_generic/region/r.1.2.mca differ diff --git a/worlds/world_generic/region/r.1.3.mca b/worlds/world_generic/region/r.1.3.mca index 42545ba..40c0684 100755 Binary files a/worlds/world_generic/region/r.1.3.mca and b/worlds/world_generic/region/r.1.3.mca differ diff --git a/worlds/world_generic/region/r.2.-1.mca b/worlds/world_generic/region/r.2.-1.mca index 0451b0e..05b54d2 100755 Binary files a/worlds/world_generic/region/r.2.-1.mca and b/worlds/world_generic/region/r.2.-1.mca differ diff --git a/worlds/world_generic/region/r.2.-2.mca b/worlds/world_generic/region/r.2.-2.mca index d13965d..6406c5b 100755 Binary files a/worlds/world_generic/region/r.2.-2.mca and b/worlds/world_generic/region/r.2.-2.mca differ diff --git a/worlds/world_generic/region/r.2.0.mca b/worlds/world_generic/region/r.2.0.mca index 4840420..dcfc694 100755 Binary files a/worlds/world_generic/region/r.2.0.mca and b/worlds/world_generic/region/r.2.0.mca differ diff --git a/worlds/world_generic/region/r.2.1.mca b/worlds/world_generic/region/r.2.1.mca index 9105610..f22d5a8 100755 Binary files a/worlds/world_generic/region/r.2.1.mca and b/worlds/world_generic/region/r.2.1.mca differ diff --git a/worlds/world_generic/region/r.2.2.mca b/worlds/world_generic/region/r.2.2.mca index 7f54cea..d9a3f74 100755 Binary files a/worlds/world_generic/region/r.2.2.mca and b/worlds/world_generic/region/r.2.2.mca differ diff --git a/worlds/world_generic/region/r.2.3.mca b/worlds/world_generic/region/r.2.3.mca index 092abff..cadfc6d 100755 Binary files a/worlds/world_generic/region/r.2.3.mca and b/worlds/world_generic/region/r.2.3.mca differ diff --git a/worlds/world_generic/region/r.3.0.mca b/worlds/world_generic/region/r.3.0.mca index db44a8a..1a3b32d 100755 Binary files a/worlds/world_generic/region/r.3.0.mca and b/worlds/world_generic/region/r.3.0.mca differ