Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-22 16:49:14 +00:00
Code Issues Releases Activity

Merge branch 'master' into printWrongSpawner

Browse Source
This commit is contained in:
Sjoerd van de Goor
2023-06-06 19:19:47 +02:00
parent 989778af26 f5a3a7eb1a
commit 673b08f174
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/core/IrisSettings.java
View File

@@ -156,6 +156,8 @@ public class IrisSettings {
public int spinh = -20; public int spinh = -20;
public int spins = 7; public int spins = 7;
public int spinb = 8; public int spinb = 8;
public String cartographerMessage = "Iris does not allow cartographers in its world due to crashes.";
@SuppressWarnings("BooleanMethodIsAlwaysInverted") @SuppressWarnings("BooleanMethodIsAlwaysInverted")
public boolean canUseCustomColors(VolmitSender volmitSender) { public boolean canUseCustomColors(VolmitSender volmitSender) {

3
src/main/java/com/volmit/iris/core/service/VillageSVC.java
View File

@@ -19,6 +19,7 @@
package com.volmit.iris.core.service; package com.volmit.iris.core.service;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.core.tools.IrisToolbelt;
import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisDimension;
import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.C;
@@ -70,7 +71,7 @@ public class VillageSVC implements IrisService {
List<Player> playersInWorld = event.getEntity().getWorld().getPlayers(); 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 + "!"); Iris.info("Cancelled Cartographer Villager to prevent server crash at " + eventLocation + "!");

2
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@@ -552,7 +552,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
public void execute(Future<Chunk> chunkFuture) { public void execute(Future<Chunk> chunkFuture) {
try { try {
chunkFuture.get(); chunkFuture.get();
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException ignored) {
} }
} }