diff --git a/build.gradle b/build.gradle index 008512834..b55a27153 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,8 @@ registerCustomOutputTask('CrazyDev22', 'C://Users/Julian/Desktop/server/plugins' registerCustomOutputTask('Pixel', 'D://Iris Dimension Engine/1.20.4 - Development/plugins') // ========================== UNIX ============================== registerCustomOutputTaskUnix('CyberpwnLT', '/Users/danielmills/development/server/plugins') -registerCustomOutputTaskUnix('PsychoLT', '/Users/brianfopiano/Developer/RemoteGit/Server/plugins') +registerCustomOutputTaskUnix('PsychoLT', '/Volumes/PRO-G40/Minecraft/MinecraftDevelopment/Server/plugins') +registerCustomOutputTaskUnix('PixelMac', '/Users/test/Desktop/mcserver/plugins') registerCustomOutputTaskUnix('CrazyDev22LT', '/home/julian/Desktop/server/plugins') // ============================================================== @@ -156,7 +157,6 @@ allprojects { compileOnly 'net.bytebuddy:byte-buddy-agent:1.12.8' compileOnly 'org.bytedeco:javacpp:1.5.10' compileOnly 'org.bytedeco:cuda-platform:12.3-8.9-1.5.10' - compileOnly 'org.mapdb:mapdb:3.1.0' } /** diff --git a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java index 2c100af02..706ba24fc 100644 --- a/core/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/core/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -46,16 +46,19 @@ import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterStructurePOI; import com.volmit.iris.util.misc.E; +import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; import java.io.File; import java.io.IOException; @@ -229,6 +232,13 @@ public class IrisEngine implements Engine { public void hotload() { hotloadSilently(); Iris.callEvent(new IrisEngineHotloadEvent(this)); + if (isStudio()) { + for (Player player : target.getWorld().getPlayers()) { + VolmitSender sender = new VolmitSender(player); + sender.sendMessage(C.GREEN + "Hotloaded"); + } + + } } public void hotloadComplex() { diff --git a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java index 49e636220..47d173ffc 100644 --- a/core/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java +++ b/core/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java @@ -78,7 +78,7 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator { } } - if (bd instanceof Bisected) { + if (bd instanceof Bisected && getDimension().getFluidHeight() - 1 != height) { bd = bd.clone(); ((Bisected) bd).setHalf(Bisected.Half.TOP); try { @@ -88,6 +88,11 @@ public class IrisSurfaceDecorator extends IrisEngineDecorator { } bd = bd.clone(); ((Bisected) bd).setHalf(Bisected.Half.BOTTOM); + try { + data.set(x, height + 1, z, bd); + } catch (Throwable e) { + Iris.reportError(e); + } } if (B.isAir(data.get(x, height + 1, z))) {