From c1c2e3baa48f16aea4ffdd104b71bcb7b67ea7df Mon Sep 17 00:00:00 2001 From: Camotoy <20743703+DoctorMacc@users.noreply.github.com> Date: Wed, 24 Jun 2020 17:38:41 -0400 Subject: [PATCH] Allow for newest ViaVersion to work with Geyser (#805) * Allow for newest ViaVersion to work with Geyser Most users should now just not use 2.2.3. * Update ViaVersion dependency --- bootstrap/bukkit/pom.xml | 2 +- .../java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap/bukkit/pom.xml b/bootstrap/bukkit/pom.xml index 95926854..ca818812 100644 --- a/bootstrap/bukkit/pom.xml +++ b/bootstrap/bukkit/pom.xml @@ -26,7 +26,7 @@ us.myles viaversion - 3.0.0-SNAPSHOT + 3.0.1 provided diff --git a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java index 3a13777b..1507f9ee 100644 --- a/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java +++ b/bootstrap/bukkit/src/main/java/org/geysermc/platform/bukkit/GeyserBukkitPlugin.java @@ -110,8 +110,8 @@ public class GeyserBukkitPlugin extends JavaPlugin implements GeyserBootstrap { if (Bukkit.getPluginManager().getPlugin("ViaVersion") != null) { // TODO: Update when ViaVersion updates // API changes between 2.2.3 and 3.0.0-SNAPSHOT require this check - if (!Via.getAPI().getVersion().equals("3.0.0-SNAPSHOT") && isLegacy) { - geyserLogger.info("ViaVersion detected but not ViaVersion-ABSTRACTION. Please update your ViaVersion plugin for compatibility with Geyser."); + if (Via.getAPI().getVersion().contains("2.2.3") && isLegacy) { + geyserLogger.info("ViaVersion detected but not the newest version of ViaVersion. Please update your ViaVersion plugin for compatibility with Geyser."); } else { isViaVersion = true; }