Make version incompatible message suggest upgrading Minecraft

CitizensDev · Apr 19, 2022 · 2e886cf · 2e886cf · sussybukaa · Apr 19, 2022
1 parent 0a6225a
commit 2e886cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/util/NMS.java b/main/src/main/java/net/citizensnpcs/util/NMS.java
@@ -598,7 +598,10 @@ public static boolean shouldJump(org.bukkit.entity.Entity entity) {
     }
 
     public static void shutdown() {
-        BRIDGE.shutdown();
+        if (BRIDGE != null) {
+            BRIDGE.shutdown();
+            BRIDGE = null;
+        }
     }
 
     public static boolean tick(Entity next) {

diff --git a/main/src/main/resources/messages_en.properties b/main/src/main/resources/messages_en.properties
@@ -407,7 +407,7 @@ citizens.nms-errors.updating-pathfinding-range=Could not update pathfinding rang
 citizens.notifications.database-connection-failed=Unable to connect to database, falling back to YAML
 citizens.notifications.error-reloading=Error occured while reloading, see console.
 citizens.notifications.exception-updating-npc=Exception while updating {0}: {1}.
-citizens.notifications.incompatible-version=v{0} is not compatible with Minecraft v{1} - try upgrading or downgrading Citizens. Disabling.
+citizens.notifications.incompatible-version=v{0} is not compatible with Minecraft v{1} - try upgrading Minecraft or Citizens. Disabling...
 citizens.notifications.locale=Using locale {0}.
 citizens.notifications.metrics-load-error=Unable to start metrics: {0}.
 citizens.notifications.missing-translations=Missing translations file for locale {0}. Defaulting to en locale.