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

Kinda fixed vine issues with PAINT.

Browse Source
This commit is contained in:
Vatuu
2022-08-13 00:37:42 +02:00
parent d2151690ad
commit 3c759f3b01
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/volmit/iris/engine/object/IrisObject.java
+4 -2
View File
@@ -781,7 +781,7 @@ public class IrisObject extends IrisRegistrant {
zz += config.warp(rng, i.getZ() + z, i.getY() + y, i.getX() + x, getLoader()); zz += config.warp(rng, i.getZ() + z, i.getY() + y, i.getX() + x, getLoader());
} }
if(yv < 0 && (config.getMode().equals(ObjectPlaceMode.PAINT))) { if(yv < 0 && (config.getMode().equals(ObjectPlaceMode.PAINT)) && !B.isVineBlock(data)) {
yy = (int) Math.round(i.getY()) + Math.floorDiv(h, 2) + placer.getHighest(xx, zz, getLoader(), config.isUnderwater()); yy = (int) Math.round(i.getY()) + Math.floorDiv(h, 2) + placer.getHighest(xx, zz, getLoader(), config.isUnderwater());
} }
@@ -823,7 +823,9 @@ public class IrisObject extends IrisRegistrant {
placer.getEngine().getMantle().getMantle().set(xx, yy, zz, new MatterMarker(markers.get(g))); placer.getEngine().getMantle().getMantle().set(xx, yy, zz, new MatterMarker(markers.get(g)));
} }
if(!data.getMaterial().equals(Material.AIR) && !data.getMaterial().equals(Material.CAVE_AIR)) { boolean wouldReplace = B.isSolid(placer.get(xx, yy, zz)) && B.isVineBlock(data);
if(!data.getMaterial().equals(Material.AIR) && !data.getMaterial().equals(Material.CAVE_AIR) && !wouldReplace) {
placer.set(xx, yy, zz, data); placer.set(xx, yy, zz, data);
if(tile != null) { if(tile != null) {
placer.setTile(xx, yy, zz, tile); placer.setTile(xx, yy, zz, tile);
src/main/java/com/volmit/iris/util/data/B.java
+2
View File
@@ -405,6 +405,8 @@ public class B {
} }
public static boolean isSolid(BlockData mat) { public static boolean isSolid(BlockData mat) {
if(mat == null)
return false;
return mat.getMaterial().isSolid(); return mat.getMaterial().isSolid();
} }