mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-17 14:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #909 from VolmitSoftware/Development

Browse Source 
Development
This commit is contained in:
Brian Fopiano
2022-09-23 20:03:37 -07:00
committed by GitHub
parent 9cf2785626 afa8fad8e9
commit a248962f1b
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+1 -1
View File
@@ -24,7 +24,7 @@ plugins {
id "de.undercouch.download" version "5.0.1" id "de.undercouch.download" version "5.0.1"
} }
version '2.3.1-1.19.2' // Needs to be version specific version '2.3.2-1.19.2' // Needs to be version specific
def nmsVersion = "1.19.2" //[NMS] def nmsVersion = "1.19.2" //[NMS]
def apiVersion = '1.19' def apiVersion = '1.19'
def specialSourceVersion = '1.11.0' //[NMS] def specialSourceVersion = '1.11.0' //[NMS]
settings.gradle
-1
View File
@@ -20,7 +20,6 @@ pluginManagement {
mavenLocal() mavenLocal()
mavenCentral() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" }
} }
} }
rootProject.name = 'Iris' rootProject.name = 'Iris'
src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java
+3 -2
View File
@@ -77,8 +77,9 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator {
((Bisected) bd).setHalf(Bisected.Half.BOTTOM); ((Bisected) bd).setHalf(Bisected.Half.BOTTOM);
} }
data.set(x, height + 1, z, fixFaces(bd, x, height + 1, z)); if(!B.isAir(data.get(x, height + 1, z))) {
data.set(x, height + 1, z, fixFaces(bd, x, height + 1, z));
}
} else { } else {
if(height < getDimension().getFluidHeight()) { if(height < getDimension().getFluidHeight()) {
max = getDimension().getFluidHeight(); max = getDimension().getFluidHeight();
src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java
+4
View File
@@ -19,6 +19,7 @@
package com.volmit.iris.engine.framework; package com.volmit.iris.engine.framework;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiome;
import com.volmit.iris.engine.object.IrisEffect; import com.volmit.iris.engine.object.IrisEffect;
import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.engine.object.IrisRegion;
@@ -48,6 +49,9 @@ public class EnginePlayer {
public void tick() { public void tick() {
sample(); sample();
if(!IrisSettings.get().getWorld().isEffectSystem())
return;
J.a(() -> { J.a(() -> {
if(region != null) { if(region != null) {
for(IrisEffect j : region.getEffects()) { for(IrisEffect j : region.getEffects()) {