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

Fixes

Browse Source
This commit is contained in:
Daniel Mills
2020-10-16 01:59:18 -04:00
parent 1a7aa1218a
commit c7f612dac0
10 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java
View File

@@ -126,11 +126,6 @@ public abstract class DimensionalTerrainProvider extends ContextualTerrainProvid
{
IrisDimension d = loadDimension(getDimensionName());
if(d == null)
{
Iris.error("Can't find dimension: " + getDimensionName());
}
return d;
}

11
src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java
View File

@@ -9,6 +9,7 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.entity.Player;
import org.bukkit.generator.BlockPopulator;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.atomics.AtomicSliver;
import com.volmit.iris.gen.atomics.AtomicSliverMap;
@@ -353,6 +354,16 @@ public abstract class ParallaxTerrainProvider extends TopographicTerrainProvider
placeObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + g++) * i * j) + i - j + 3566522));
}
if(r == null)
{
Iris.error("R Null");
}
if(r.getSurfaceObjects() == null)
{
Iris.error("Surface objects null");
}
if(r != null)
{
for(IrisObjectPlacement k : r.getSurfaceObjects())

3
src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java
View File

@@ -15,7 +15,6 @@ import org.bukkit.generator.BlockPopulator;
import org.bukkit.generator.ChunkGenerator;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings;
import com.volmit.iris.gen.IrisTerrainProvider;
import com.volmit.iris.gen.scaffold.HeightedFakeWorld;
import com.volmit.iris.gen.scaffold.Provisioned;
@@ -38,7 +37,7 @@ public class ProvisionBukkit extends ChunkGenerator implements Provisioned
private final TerrainProvider provider;
private final KMap<ChunkPosition, TerrainChunk> precache;
private KList<ChunkPosition> regenerated = new KList<ChunkPosition>();
private Executor e = Executors.newFixedThreadPool(IrisSettings.get().getThreads());
private Executor e = Executors.newFixedThreadPool(Iris.getThreadCount());
private World cachedWorld;
public ProvisionBukkit(TerrainProvider provider)