From 691b10f2fe48d4796d9e563fc4401f8e32765349 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Nov 2019 00:36:57 -0600 Subject: [PATCH] Fix alfheim portals being weird. Closes #3017 --- .../botania/common/block/tile/TileAlfPortal.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 300f0d686..853545cd3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -235,9 +235,10 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { i++; } + List pylons = locatePylons(); for(RecipeElvenTrade recipe : BotaniaAPI.elvenTradeRecipes.values()) { if(recipe.matches(stacksIn, false)) { - if(consumeMana(null, 500, false)) { + if(consumeMana(pylons, 500, false)) { recipe.matches(stacksIn, true); for(ItemStack output : recipe.getOutputs()) spawnItem(output.copy()); @@ -349,7 +350,7 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { List pylons = locatePylons(); for(BlockPos pos : pylons) { - TileEntity tile = world.getTileEntity(getPos().add(pos)); + TileEntity tile = world.getTileEntity(pos); if(tile instanceof TilePylon) { TilePylon pylon = (TilePylon) tile; pylon.activated = true; @@ -361,13 +362,10 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { consumeMana(pylons, 200000, true); } - public boolean consumeMana(@Nullable List pylons, int totalCost, boolean close) { - List consumePools = new ArrayList(); + public boolean consumeMana(List pylons, int totalCost, boolean close) { + List consumePools = new ArrayList<>(); int consumed = 0; - if(pylons == null) - pylons = locatePylons(); - if(pylons.size() < 2) { closeNow = true; return false; @@ -377,14 +375,14 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { int expectedConsumption = costPer * pylons.size(); for(BlockPos pos : pylons) { - TileEntity tile = world.getTileEntity(getPos().add(pos)); + TileEntity tile = world.getTileEntity(pos); if(tile instanceof TilePylon) { TilePylon pylon = (TilePylon) tile; pylon.activated = true; pylon.centerPos = getPos(); } - tile = world.getTileEntity(getPos().add(pos).down()); + tile = world.getTileEntity(pos.down()); if(tile instanceof TilePool) { TilePool pool = (TilePool) tile;