From b6fdde403ad926719995c5a603e524c9028f4b1e Mon Sep 17 00:00:00 2001
From: Daniel Mills <danielmillst@gmail.com>
Date: Fri, 27 Nov 2020 19:26:41 -0500
Subject: [PATCH] More fixes

---
 pom.xml                                       |  2 +-
 .../actuator/IrisTerrainActuator.java         |  8 +++++--
 .../modifier/IrisRavineModifier.java          |  5 +++++
 .../com/volmit/iris/manager/IrisProject.java  | 22 ++++++++++++++++++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d0fd0215..bebc9e198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.volmit</groupId>
 	<artifactId>Iris</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.3</version>
 	<name>Iris</name>
 	<properties>
 		<skip.copy>false</skip.copy>
diff --git a/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java b/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java
index cda822f40..1a1d3e655 100644
--- a/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java
+++ b/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java
@@ -50,8 +50,12 @@ public class IrisTerrainActuator extends EngineAssignedActuator<BlockData>
                     continue;
                 }
 
-                for(i = hf; i >= b; i--)
-                {
+                for(i = hf; i >= b; i--) {
+                    if (i >= h.getHeight())
+                    {
+                        continue;
+                    }
+
                     if(i == b && getDimension().isBedrock())
                     {
                         h.set(xf, i, zf, BEDROCK);
diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java b/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java
index 6a6af968b..a25e780a5 100644
--- a/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java
+++ b/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java
@@ -23,6 +23,11 @@ public class IrisRavineModifier extends EngineAssignedModifier<BlockData> {
 
     @Override
     public void onModify(int x, int z, Hunk<BlockData> output) {
+        if(!getDimension().isRavines())
+        {
+            return;
+        }
+
         PrecisionStopwatch p = PrecisionStopwatch.start();
         generateRavines(rng, Math.floorDiv(x, 16), Math.floorDiv(z, 16), output);
         getEngine().getMetrics().getRavine().put(p.getMilliseconds());
diff --git a/src/main/java/com/volmit/iris/manager/IrisProject.java b/src/main/java/com/volmit/iris/manager/IrisProject.java
index 3aec012c8..132a13e64 100644
--- a/src/main/java/com/volmit/iris/manager/IrisProject.java
+++ b/src/main/java/com/volmit/iris/manager/IrisProject.java
@@ -58,11 +58,12 @@ public class IrisProject
 			try
 			{
 				File f = d.getLoader().getDataFolder();
-
+				boolean foundWork = false;
 				for(File i : f.listFiles())
 				{
 					if(i.getName().endsWith(".code-workspace"))
 					{
+						foundWork = true;
 						sender.sendMessage("Updating Workspace...");
 						J.a(() ->
 						{
@@ -78,6 +79,25 @@ public class IrisProject
 						break;
 					}
 				}
+
+				if(!foundWork)
+				{
+					File ff = new File(d.getLoader().getDataFolder(), d.getLoadKey() + ".code-workspace");
+					Iris.warn("Project missing code-workspace: " + ff.getAbsolutePath() + " Re-creating code workspace.");
+
+					try
+					{
+						IO.writeAll(ff, createCodeWorkspaceConfig());
+					}
+
+					catch(IOException e1)
+					{
+						e1.printStackTrace();
+					}
+					sender.sendMessage("Updating Workspace...");
+					updateWorkspace();
+					sender.sendMessage("Workspace Updated");
+				}
 			}
 
 			catch(Throwable e)