From 491cdc5fef78aa7ee97b185caf49d88adf8ce324 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Fri, 11 Jun 2021 09:54:51 +0200 Subject: [PATCH 1/4] Update EngineParallaxManager.java --- .../volmit/iris/scaffold/engine/EngineParallaxManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index e341433e9..41b2a7e20 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -526,6 +526,10 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { for(int i = 0; i < objectPlacement.getDensity(); i++) { IrisObject v = objectPlacement.getObject(getComplex(), rng); + if (v == null){ + Iris.error("ParallaxManager tried placing an object but found none existed, where one was expected."); + return; + } int xx = rng.i(x, x+16); int zz = rng.i(z, z+16); int id = rng.i(0, Integer.MAX_VALUE); From b565cf4be1c0b45e1f18f165d7b6df164f12914f Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 12 Jun 2021 12:40:12 +0200 Subject: [PATCH 2/4] ok, remove debug --- build.gradle | 4 ++-- .../volmit/iris/scaffold/engine/EngineParallaxManager.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 05e4ef915..593b8e589 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,13 @@ plugins { } group 'com.volmit.iris' -version '1.3.9' +version '1.3.12' def apiVersion = '1.14' def name = 'Iris' def main = 'com.volmit.iris.Iris' // ============================================================== -registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); +registerCustomOutputTask('Cyberpwn', 'C://Users/sjoer/documents/VolmitSoftware/server/plugins'); // ============================================================== configurations { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index 41b2a7e20..0b9c2728a 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -527,7 +527,6 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { { IrisObject v = objectPlacement.getObject(getComplex(), rng); if (v == null){ - Iris.error("ParallaxManager tried placing an object but found none existed, where one was expected."); return; } int xx = rng.i(x, x+16); From 991f2412093fce5c0e5102b1fc821b12b3f91c44 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 12 Jun 2021 12:40:27 +0200 Subject: [PATCH 3/4] Revert "ok, remove debug" This reverts commit b565cf4be1c0b45e1f18f165d7b6df164f12914f. --- build.gradle | 4 ++-- .../volmit/iris/scaffold/engine/EngineParallaxManager.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 593b8e589..05e4ef915 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,13 @@ plugins { } group 'com.volmit.iris' -version '1.3.12' +version '1.3.9' def apiVersion = '1.14' def name = 'Iris' def main = 'com.volmit.iris.Iris' // ============================================================== -registerCustomOutputTask('Cyberpwn', 'C://Users/sjoer/documents/VolmitSoftware/server/plugins'); +registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); // ============================================================== configurations { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index 0b9c2728a..41b2a7e20 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -527,6 +527,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { { IrisObject v = objectPlacement.getObject(getComplex(), rng); if (v == null){ + Iris.error("ParallaxManager tried placing an object but found none existed, where one was expected."); return; } int xx = rng.i(x, x+16); From c1831e58f5038c571c984d37fa2355b6d65e4202 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Sat, 12 Jun 2021 12:40:56 +0200 Subject: [PATCH 4/4] oops, removed again, without gradle --- .../com/volmit/iris/scaffold/engine/EngineParallaxManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index 41b2a7e20..0b9c2728a 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -527,7 +527,6 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { { IrisObject v = objectPlacement.getObject(getComplex(), rng); if (v == null){ - Iris.error("ParallaxManager tried placing an object but found none existed, where one was expected."); return; } int xx = rng.i(x, x+16);