diff --git a/src/main/java/com/volmit/iris/core/IrisSettings.java b/src/main/java/com/volmit/iris/core/IrisSettings.java index c389cc963..3d2a381d6 100644 --- 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 class IrisSettings { 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 index d8497e003..820f40833 100644 --- 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 class VillageSVC implements IrisService { List 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 index ccca9abfe..cfaa4383a 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -552,7 +552,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { public void execute(Future chunkFuture) { try { chunkFuture.get(); - } catch (InterruptedException | ExecutionException e) { + } catch (InterruptedException | ExecutionException ignored) { } }