mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #703 from VolmitSoftware/master

Browse Source 
Merge
This commit is contained in:
Brian Fopiano 2022-01-09 16:49:35 -08:00 committed by GitHub
commit 6a2e1f0271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/volmit/iris/engine/IrisWorldManager.java
View File

@ -139,6 +139,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
updateChunks();
}
if (getDimension().isInfiniteEnergy()) {
energy += 1000;
fixEnergy();
@ -285,7 +286,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
}
private void fixEnergy() {
energy = M.clip(energy, 1D, 1000D);
energy = M.clip(energy, 1D, getDimension().getMaximumEnergy());
}
private void spawnIn(Chunk c, boolean initial) {

4
src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@ -211,6 +211,10 @@ public class IrisDimension extends IrisRegistrant {
private KList<IrisShapedGeneratorStyle> overlayNoise = new KList<>();
@Desc("If true, the spawner system has infinite energy. This is NOT recommended because it would allow for mobs to keep spawning over and over without a rate limit")
private boolean infiniteEnergy = false;
@MinNumber(0)
@MaxNumber(10000)
@Desc("This is the maximum energy you can have in a dimension")
private double maximumEnergy = 1000;
@MinNumber(0.0001)
@MaxNumber(512)
@Desc("The rock zoom mostly for zooming in on a wispy palette")

1
src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java
View File

@ -161,6 +161,7 @@ public class IrisEntitySpawn implements IRare {
try {
IrisEntity irisEntity = getRealEntity(g);
if(irisEntity == null){ // No entity
Iris.debug(" You are trying to spawn an entity that does not exist!");
return null;
}