mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tree placement

Browse Source
This commit is contained in:
Daniel Mills 2021-07-27 15:27:21 -04:00
parent 287e3a0090
commit 295e51181b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/volmit/iris/core/TreeManager.java
View File

@ -26,6 +26,7 @@ import com.volmit.iris.engine.object.*;
import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.common.IObjectPlacer;
import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.object.tile.TileData;
import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.collection.KMap;
import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.data.Cuboid;
import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.BlockPosition;
import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RNG;
@ -102,6 +103,7 @@ public class TreeManager implements Listener {
saplingPlane.forEach(block -> block.setType(Material.AIR)); saplingPlane.forEach(block -> block.setType(Material.AIR));
IrisObject object = worldAccess.getData().getObjectLoader().load(placement.getPlace().getRandom(RNG.r)); IrisObject object = worldAccess.getData().getObjectLoader().load(placement.getPlace().getRandom(RNG.r));
List<BlockState> blockStateList = new KList<>(); List<BlockState> blockStateList = new KList<>();
KMap<Location, BlockData> dataCache = new KMap<>();
IObjectPlacer placer = new IObjectPlacer() { IObjectPlacer placer = new IObjectPlacer() {
@Override @Override
@ -120,6 +122,7 @@ public class TreeManager implements Listener {
BlockState state = b.getState(); BlockState state = b.getState();
state.setBlockData(d); state.setBlockData(d);
blockStateList.add(b.getState()); blockStateList.add(b.getState());
dataCache.put(new Location(event.getWorld(), x,y,z), d);
} }
@Override @Override
@ -183,7 +186,12 @@ public class TreeManager implements Listener {
if (!iGrow.isCancelled()) { if (!iGrow.isCancelled()) {
for (BlockState block : iGrow.getBlocks()) { for (BlockState block : iGrow.getBlocks()) {
block.update(true, false); Location l = block.getLocation();
if(dataCache.containsKey(l))
{
l.getBlock().setBlockData(dataCache.get(l), false);
}
} }
} }
}); });