proper stop on legacy check & add env variable to bypass

This commit is contained in:
alexcrea 2026-07-16 18:26:52 +02:00
parent 37cd603575
commit da10f0df5f
Signed by: alexcrea
GPG key ID: E59DF23EE2A2266C

View file

@ -136,7 +136,7 @@ open class CustomAnvil : JavaPlugin() {
override fun onEnable() { override fun onEnable() {
instance = this instance = this
try { try {
legacyCheck() if(legacyCheck()) return
} catch (e: Exception) { } catch (e: Exception) {
logger.log(Level.SEVERE, "error trying to check for legacy system", e) logger.log(Level.SEVERE, "error trying to check for legacy system", e)
MetricsUtil.trackError(e) MetricsUtil.trackError(e)
@ -202,14 +202,15 @@ open class CustomAnvil : JavaPlugin() {
} }
} }
private fun legacyCheck() { private fun legacyCheck(): Boolean {
val currentVersion = UpdateUtils.currentMinecraftVersion() val currentVersion = UpdateUtils.currentMinecraftVersion()
if (currentVersion.greaterEqual(Version(1, 21, 0)) if (currentVersion.greaterEqual(Version(1, 21, 0))
&& !DependencyManager.inTesting) { && !DependencyManager.inTesting
&& !"true".equals(System.getenv("CUSTOM_ANVIL_BYPASS_LEGACY_CHECK"), true)) {
logger.warning("You are running a Minecraft version above or equal to 1.21.0") logger.warning("You are running a Minecraft version above or equal to 1.21.0")
logger.warning("Please use CustomAnvil v2 instead if you wish to use the plugin with this version.") logger.warning("Please use CustomAnvil v2 instead if you wish to use the plugin with this version.")
Bukkit.getPluginManager().disablePlugin(this) Bukkit.getPluginManager().disablePlugin(this)
return return true
} }
// Disable old plugin name if exist // Disable old plugin name if exist
val potentialPlugin = Bukkit.getPluginManager().getPlugin("UnsafeEnchantsPlus") val potentialPlugin = Bukkit.getPluginManager().getPlugin("UnsafeEnchantsPlus")
@ -242,6 +243,7 @@ open class CustomAnvil : JavaPlugin() {
logger.warning("An update may be available: $latestVer") logger.warning("An update may be available: $latestVer")
} }
return false
} }
private fun registerListeners() { private fun registerListeners() {