From a02058b12730c1a0c8b2dcde209f8480be004c1e Mon Sep 17 00:00:00 2001 From: Brianna Date: Mon, 28 Sep 2020 11:19:37 -0500 Subject: [PATCH 1/2] Fix biome compatibility issue with 1.13 and 1.14 servers. --- .../com/songoda/core/compatibility/CompatibleBiome.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/main/java/com/songoda/core/compatibility/CompatibleBiome.java b/Core/src/main/java/com/songoda/core/compatibility/CompatibleBiome.java index 6b52c70c..9c20d21c 100644 --- a/Core/src/main/java/com/songoda/core/compatibility/CompatibleBiome.java +++ b/Core/src/main/java/com/songoda/core/compatibility/CompatibleBiome.java @@ -126,7 +126,7 @@ public enum CompatibleBiome { if (biome.isCompatible()) compatibleBiomes.add(biome); - if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { + if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15)) { Class classBiomeBase = NMSUtils.getNMSClass("BiomeBase"), classCraftChunk = NMSUtils.getCraftClass("CraftChunk"), classCraftBlock = NMSUtils.getCraftClass("block.CraftBlock"), @@ -193,7 +193,7 @@ public enum CompatibleBiome { Object nmsChunk = null; Object biomeStorage = null; Object biomeBase = null; - if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) { + if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15)) { nmsChunk = methodGetHandle.invoke(chunk); biomeStorage = methodGetBiomeIndex.invoke(nmsChunk); if (isAbove1_16_R1) { @@ -208,14 +208,14 @@ public enum CompatibleBiome { int chunkZ = chunk.getZ(); for (int x = chunkX << 4; x < (chunkX << 4) + 16; x++) { for (int z = chunkZ << 4; z < (chunkZ << 4) + 16; z++) { - if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) + if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15)) for (int y = 0; y < world.getMaxHeight(); ++y) methodSetBiome.invoke(biomeStorage, x >> 2, y >> 2, z >> 2, biomeBase); else chunk.getWorld().setBiome(x, z, getBiome()); } } - if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_13)) + if (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_15)) methodMarkDirty.invoke(nmsChunk); } From 0755fadc00de8c3ffbfa293c34bcaa4fd40f4347 Mon Sep 17 00:00:00 2001 From: Brianna Date: Mon, 28 Sep 2020 11:19:46 -0500 Subject: [PATCH 2/2] version 2.4.10 --- .idea/jarRepositories.xml | 10 ++++++++++ Core/pom.xml | 2 +- Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +- NMS/NMS-API/pom.xml | 2 +- NMS/NMS-v1_10_R1/pom.xml | 2 +- NMS/NMS-v1_11_R1/pom.xml | 2 +- NMS/NMS-v1_12_R1/pom.xml | 2 +- NMS/NMS-v1_13_R1/pom.xml | 2 +- NMS/NMS-v1_13_R2/pom.xml | 2 +- NMS/NMS-v1_14_R1/pom.xml | 2 +- NMS/NMS-v1_15_R1/pom.xml | 2 +- NMS/NMS-v1_16_R1/pom.xml | 2 +- NMS/NMS-v1_16_R2/pom.xml | 2 +- NMS/NMS-v1_8_R1/pom.xml | 2 +- NMS/NMS-v1_8_R2/pom.xml | 2 +- NMS/NMS-v1_8_R3/pom.xml | 2 +- NMS/NMS-v1_9_R1/pom.xml | 2 +- NMS/NMS-v1_9_R2/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 51569f58..461027ae 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -16,6 +16,11 @@