From d810cad8d05b77a9a344751800ed3cf79c791611 Mon Sep 17 00:00:00 2001 From: Oak Date: Mon, 17 Jun 2024 15:50:06 +0100 Subject: [PATCH] Adjusted code for Spigot compatibility --- .../main/java/com/dfsek/terra/bukkit/nms/Initializer.java | 5 +++-- .../main/java/com/dfsek/terra/bukkit/util/VersionUtil.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java index 2b9217847..db50be325 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java @@ -1,6 +1,7 @@ package com.dfsek.terra.bukkit.nms; -import org.bukkit.Bukkit; +import com.dfsek.terra.bukkit.util.VersionUtil; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +9,7 @@ import com.dfsek.terra.bukkit.PlatformImpl; public interface Initializer { - String NMS = "v" + Bukkit.getServer().getMinecraftVersion().replace(".", "_"); + String NMS = "v" + VersionUtil.getMinecraftVersionInfo().toString().replace(".", "_"); String TERRA_PACKAGE = Initializer.class.getPackageName(); static boolean init(PlatformImpl platform) { diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java index 848befc60..97f4b713f 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java @@ -83,7 +83,7 @@ public final class VersionUtil { private final int patch; private MinecraftVersionInfo() { - this(Bukkit.getServer().getMinecraftVersion()); + this(Bukkit.getServer().getBukkitVersion().split("-")[0]); } private MinecraftVersionInfo(int major, int minor, int patch) {