From c57ac4c9fe8dc5d71bcd2ca2a1298811e747caf0 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Wed, 10 Mar 2021 10:52:01 +0100 Subject: [PATCH] Remove villager building cancelling check This reintroduces villages but they can spawn in the water --- .../com/volmit/iris/scaffold/jigsaw/PlannedStructure.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java index 08ef49748..d01ac2f5d 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java @@ -114,11 +114,11 @@ public class PlannedStructure { for(IrisJigsawPieceConnector j : i.getAvailableConnectors()) { - if(j.getSpawnEntity() != null && h != -1) + if(j.getSpawnEntity() != null)// && h != -1) { IrisPosition p; if (j.getEntityPosition() == null){ - p = new IrisPosition(j.getDirection().toVector().multiply(2)); + p = i.getWorldPosition(j).add(new IrisPosition(j.getDirection().toVector().multiply(2))); } else { p = i.getWorldPosition(j).add(j.getEntityPosition()); } @@ -132,7 +132,9 @@ public class PlannedStructure { { p.setY(height); } - + if (j.getSpawnEntity().equals("villager")){ + Iris.msg("Spawning villager on jigsaw @" + p.getX() + "/" + p.getY() + "/" + p.getZ()); + } e.getParallaxAccess().setEntity(p.getX(), p.getY(), p.getZ(), j.getSpawnEntity()); } }