Merge branch 'master' into printWrongSpawner

VolmitSoftware · Jun 6, 2023 · 673b08f · 673b08f
2 parents 989778a + f5a3a7e
commit 673b08f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/com/volmit/iris/core/IrisSettings.java b/src/main/java/com/volmit/iris/core/IrisSettings.java
@@ -156,6 +156,8 @@ public static class IrisSettingsGeneral {
         public int spinh = -20;
         public int spins = 7;
         public int spinb = 8;
+        public String cartographerMessage = "Iris does not allow cartographers in its world due to crashes.";
+
 
         @SuppressWarnings("BooleanMethodIsAlwaysInverted")
         public boolean canUseCustomColors(VolmitSender volmitSender) {

diff --git a/src/main/java/com/volmit/iris/core/service/VillageSVC.java b/src/main/java/com/volmit/iris/core/service/VillageSVC.java
@@ -19,6 +19,7 @@
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.util.format.C;
@@ -70,7 +71,7 @@ public void on(VillagerCareerChangeEvent event) {
 
             List<Player> playersInWorld = event.getEntity().getWorld().getPlayers();
 
-            String message = C.GOLD + "Iris does not allow cartographers in its world due to crashes.";
+            String message = C.GOLD + IrisSettings.get().getGeneral().cartographerMessage;
 
             Iris.info("Cancelled Cartographer Villager to prevent server crash at " + eventLocation + "!");
 

diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java
@@ -552,7 +552,7 @@ private void warmupAreaAsync(Player player, Location to, Runnable r) {
                 public void execute(Future<Chunk> chunkFuture) {
                     try {
                         chunkFuture.get();
-                    } catch (InterruptedException | ExecutionException e) {
+                    } catch (InterruptedException | ExecutionException ignored) {
 
                     }
                 }