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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Daniel Mills
2021-07-21 10:39:44 -04:00
parent aa25feb57e b203fc7c68
commit d990bf794a
8 changed files with 123 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/volmit/iris/core/IrisProject.java
View File

@@ -273,8 +273,9 @@ public class IrisProject {
break;
}
}
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generation Complete"));
if (sender.isPlayer()) {
sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generation Complete"));
}
});
//@builder

2
src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java
View File

@@ -74,7 +74,7 @@ public class CommandIrisPregen extends MortarCommand {
if (args[0].equalsIgnoreCase("stop") || args[0].equalsIgnoreCase("x")) {
if (PregeneratorJob.shutdownInstance()) {
sender.sendMessage("Stopped Pregen.");
sender.sendMessage("Stopped Pregen. Finishing last region file before shutting down...");
} else {
sender.sendMessage("No Active Pregens.");
}

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

@@ -134,7 +134,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
}
public void tick() {
if (isClosed()) {
if (getComposite() == null || isClosed()) {
return;
}

2
src/main/java/com/volmit/iris/util/scheduling/Looper.java
View File

@@ -42,7 +42,7 @@ public abstract class Looper extends Thread {
}
}
Iris.info("Thread " + getName() + " Shutdown.");
Iris.info("Thread " + getName() + " Shutdown. Pregen stopped / finished.");
}
protected abstract long loop();