mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-18 14:50:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tuning + Fixed server distro reading for 1.20.6+

Browse Source
This commit is contained in:
RePixelatedMC
2024-06-01 16:21:57 +02:00
parent cee94d40e1
commit cfc52ed909
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/volmit/iris/core/safeguard/ServerBootSFG.java
+13 -8
View File
@@ -5,7 +5,7 @@ import com.volmit.iris.core.nms.INMS;
import com.volmit.iris.core.nms.v1X.NMSBinding1X; import com.volmit.iris.core.nms.v1X.NMSBinding1X;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager;
import javax.tools.JavaCompiler; import javax.tools.JavaCompiler;
import javax.tools.ToolProvider; import javax.tools.ToolProvider;
import java.io.File; import java.io.File;
@@ -40,7 +40,7 @@ public class ServerBootSFG {
public static void BootCheck() { public static void BootCheck() {
Iris.info("Checking for possible conflicts.."); Iris.info("Checking for possible conflicts..");
org.bukkit.plugin.PluginManager pluginManager = Bukkit.getPluginManager(); PluginManager pluginManager = Bukkit.getPluginManager();
Plugin[] plugins = pluginManager.getPlugins(); Plugin[] plugins = pluginManager.getPlugins();
incompatibilities.clear(); incompatibilities.clear();
@@ -65,17 +65,22 @@ public class ServerBootSFG {
joiner.add(entry.getKey()); joiner.add(entry.getKey());
} }
} }
// Legacy ServerInfo
String distro = org.bukkit.Bukkit.getName().toLowerCase();
if ( if (
!instance.getServer().getVersion().contains("Purpur") && !distro.contains("purpur") &&
!instance.getServer().getVersion().contains("Paper") && !distro.contains("paper") &&
!instance.getServer().getVersion().contains("Spigot") && !distro.contains("spigot") &&
!instance.getServer().getVersion().contains("Pufferfish") && !distro.contains("pufferfish") &&
!instance.getServer().getVersion().contains("Bukkit")) { !distro.contains("bukkit")) {
passedserversoftware = false; passedserversoftware = false;
joiner.add("Server Software"); joiner.add("Server Software");
severityHigh++; severityMedium++;
} }
if (INMS.get() instanceof NMSBinding1X) { if (INMS.get() instanceof NMSBinding1X) {
unsuportedversion = true; unsuportedversion = true;
joiner.add("Unsupported Minecraft Version"); joiner.add("Unsupported Minecraft Version");
core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class IrisJigsawStructurePlacement implements IRare {
} }
if (separation == -1 || spacing == -1) { if (separation == -1 || spacing == -1) {
separation = (int) Math.round(rarity / 20d); separation = (int) Math.round(rarity / 15d);
spacing = new RNG(seed).nextInt(separation, separation * 2); spacing = new RNG(seed).nextInt(separation, separation * 2);
} }
} }