Settings changes and fix npes

This commit is contained in:
Daniel Mills 2021-07-22 21:26:01 -04:00
parent 5e0b4e1be6
commit 954f0cc26f
5 changed files with 9 additions and 5 deletions

View File

@ -5,7 +5,7 @@ plugins {
} }
group 'com.volmit.iris' group 'com.volmit.iris'
version '1.5.7' version '1.5.8'
def apiVersion = '1.17' def apiVersion = '1.17'
def name = 'Iris' def name = 'Iris'
def main = 'com.volmit.iris.Iris' def main = 'com.volmit.iris.Iris'

View File

@ -558,10 +558,9 @@ public class Iris extends VolmitPlugin implements Listener {
} }
public boolean isMCA() { public boolean isMCA() {
return IrisSettings.get().getGenerator().isMcaPregenerator(); return !IrisSettings.get().getGenerator().isDisableMCA();
} }
public static void reportErrorChunk(int x, int z, Throwable e, String extra) { public static void reportErrorChunk(int x, int z, Throwable e, String extra) {
if (IrisSettings.get().getGeneral().isDebug()) { if (IrisSettings.get().getGeneral().isDebug()) {
File f = instance.getDataFile("debug", "chunk-errors", "chunk."+ x + "." + z + ".txt"); File f = instance.getDataFile("debug", "chunk-errors", "chunk."+ x + "." + z + ".txt");

View File

@ -108,7 +108,7 @@ public class IrisSettings {
public static class IrisSettingsGenerator { public static class IrisSettingsGenerator {
public String defaultWorldType = "overworld"; public String defaultWorldType = "overworld";
public boolean mcaPregenerator = false; public boolean disableMCA = false;
public boolean systemEffects = true; public boolean systemEffects = true;
public boolean systemEntitySpawnOverrides = true; public boolean systemEntitySpawnOverrides = true;
public boolean systemEntityInitialSpawns = true; public boolean systemEntityInitialSpawns = true;

View File

@ -42,7 +42,7 @@ public class HybridPregenMethod implements PregeneratorMethod {
} }
private boolean supportsHeadless(World world) { private boolean supportsHeadless(World world) {
return IrisWorlds.access(world) != null && IrisSettings.get().getGenerator().isMcaPregenerator(); return IrisWorlds.access(world) != null && !IrisSettings.get().getGenerator().isDisableMCA();
} }
@Override @Override

View File

@ -68,6 +68,11 @@ public class IrisObjectRotation {
} }
public IrisObject rotateCopy(IrisObject e) { public IrisObject rotateCopy(IrisObject e) {
if(e == null)
{
return null;
}
return e.rotateCopy(this); return e.rotateCopy(this);
} }