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

Fixed vines and derivatives not placing properly in objects.

Browse Source
This commit is contained in:
Vatuu
2022-07-27 19:35:18 +02:00
parent 2ed5aa8730
commit ce3c334ac5
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/object/IrisObject.java
+25 -1
View File
@@ -47,9 +47,11 @@ import lombok.experimental.Accessors;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.TileState; import org.bukkit.block.TileState;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.MultipleFacing;
import org.bukkit.block.data.Waterlogged; import org.bukkit.block.data.Waterlogged;
import org.bukkit.block.data.type.Leaves; import org.bukkit.block.data.type.Leaves;
import org.bukkit.util.BlockVector; import org.bukkit.util.BlockVector;
@@ -803,6 +805,16 @@ public class IrisObject extends IrisRegistrant {
((Waterlogged) data).setWaterlogged(true); ((Waterlogged) data).setWaterlogged(true);
} }
if(B.isVineBlock(data)) {
MultipleFacing f = (MultipleFacing)data;
for(BlockFace face : f.getAllowedFaces()) {
BlockData facingBlock = placer.get(xx + face.getModX(), yy + face.getModY(), zz + face.getModZ());
if(B.isSolid(facingBlock) && !B.isVineBlock(facingBlock)) {
f.setFace(face, true);
}
}
}
if(listener != null) { if(listener != null) {
listener.accept(new BlockPosition(xx, yy, zz)); listener.accept(new BlockPosition(xx, yy, zz));
} }
@@ -895,8 +907,20 @@ public class IrisObject extends IrisRegistrant {
if(settings.getYMax() != 0) if(settings.getYMax() != 0)
lowerBound -= Math.min(config.getStiltSettings().getYMax() - (lowest + y - highest), 0); lowerBound -= Math.min(config.getStiltSettings().getYMax() - (lowest + y - highest), 0);
} }
for(int j = lowest + y; j > lowerBound; j--) for(int j = lowest + y; j > lowerBound; j--) {
if(B.isVineBlock(d)) {
MultipleFacing f = (MultipleFacing)d;
for(BlockFace face : f.getAllowedFaces()) {
BlockData facingBlock = placer.get(xx + face.getModX(), j + face.getModY(), zz + face.getModZ());
Iris.warn(facingBlock.getAsString());
if(B.isSolid(facingBlock) && !B.isVineBlock(facingBlock)) {
f.setFace(face, true);
}
}
}
placer.set(xx, j, zz, d); placer.set(xx, j, zz, d);
}
} }
readLock.unlock(); readLock.unlock();