mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-19 07:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hot reload listener for datapacks and stilts underwater.

Browse Source
This commit is contained in:
Vatuu
2022-05-15 22:10:17 +02:00
parent 11b05b10a4
commit e7c458de3f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/IrisEngine.java
+5
View File
@@ -21,6 +21,7 @@ package com.volmit.iris.engine;
import com.google.common.util.concurrent.AtomicDouble; import com.google.common.util.concurrent.AtomicDouble;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import com.volmit.iris.core.ServerConfigurator;
import com.volmit.iris.core.events.IrisEngineHotloadEvent; import com.volmit.iris.core.events.IrisEngineHotloadEvent;
import com.volmit.iris.core.gui.PregeneratorJob; import com.volmit.iris.core.gui.PregeneratorJob;
import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.project.IrisProject;
@@ -233,6 +234,10 @@ public class IrisEngine implements Engine {
getTarget().setDimension(getData().getDimensionLoader().load(getDimension().getLoadKey())); getTarget().setDimension(getData().getDimensionLoader().load(getDimension().getLoadKey()));
prehotload(); prehotload();
setupEngine(); setupEngine();
J.a(() -> {
Iris.warn("Meme.");
synchronized(ServerConfigurator.class) { ServerConfigurator.installDataPacks(false); }
});
} }
@Override @Override
src/main/java/com/volmit/iris/engine/object/IrisObject.java
+2 -2
View File
@@ -719,7 +719,7 @@ public class IrisObject extends IrisRegistrant {
i = config.getRotation().rotate(i.clone(), spinx, spiny, spinz).clone(); i = config.getRotation().rotate(i.clone(), spinx, spiny, spinz).clone();
i = config.getTranslate().translate(i.clone(), config.getRotation(), spinx, spiny, spinz).clone(); i = config.getTranslate().translate(i.clone(), config.getRotation(), spinx, spiny, spinz).clone();
if(stilting && i.getBlockY() < lowest && !B.isAir(data)) { if(stilting && i.getBlockY() < lowest && !B.isAirOrFluid(data)) {
lowest = i.getBlockY(); lowest = i.getBlockY();
} }
@@ -825,7 +825,7 @@ public class IrisObject extends IrisRegistrant {
} }
if(d == null || B.isAir(d)) { if(d == null || B.isAirOrFluid(d)) {
continue; continue;
} }