From e65cdfb197ec0a63dbb377d89e44b94aaf773585 Mon Sep 17 00:00:00 2001 From: onebeastchris Date: Sun, 11 Aug 2024 00:46:07 +0200 Subject: [PATCH] slightly diff phrasing, add comment to velocity --- .../org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java | 2 +- .../geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java index 0ff30595a..a2d52ce5a 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/geyser/platform/spigot/GeyserSpigotPlugin.java @@ -152,7 +152,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap { return; } - // Now: Check for velocity mode - deliberately after checking bungeecord because this is a paper config + // Now: Check for velocity mode - deliberately after checking bungeecord because this is a paper only option if (Bukkit.getServer().spigot().getPaperConfig().getBoolean("proxies.velocity.enabled")) { warnInvalidProxySetups("Velocity"); return; diff --git a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java index 41294bd1f..413355813 100644 --- a/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java +++ b/bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityPlugin.java @@ -113,6 +113,7 @@ public class GeyserVelocityPlugin implements GeyserBootstrap { @Override public void onGeyserEnable() { + // If e.g. the config failed to load, GeyserImpl was not loaded and we cannot start if (geyser == null) { return; }