From 37379acd3d92a047bd4293192bbf1b1b60f02904 Mon Sep 17 00:00:00 2001 From: Ressed <26176604+Ressed@users.noreply.github.com> Date: Sun, 25 Oct 2026 16:11:37 +0800 Subject: [PATCH] Backport upstream commit to fix desyncs in statement of Elf Portal (#158) --- .../vazkii/botania/common/block/BlockAlfPortal.java | 11 +++++++---- .../botania/common/block/tile/TileAlfPortal.java | 6 ++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 762368870..54a616688 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -62,10 +62,13 @@ public class BlockAlfPortal extends BlockModContainer implements @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { - boolean did = ((TileAlfPortal) world.getTileEntity(x, y, z)).onWanded(); - if(did && player != null) - player.addStat(ModAchievements.elfPortalOpen, 1); - return did; + if(!world.isRemote) { + boolean did = ((TileAlfPortal) world.getTileEntity(x, y, z)).onWanded(); + if(did && player != null) + player.addStat(ModAchievements.elfPortalOpen, 1); + return did; + } + return true; } @Override 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 598e41d1c..ad17095fc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -167,7 +167,8 @@ public class TileAlfPortal extends TileMod { } else closeNow = false; if(closeNow) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 1 | 2); + if(!worldObj.isRemote) + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, 0, 1 | 2); for(int i = 0; i < 36; i++) blockParticle(meta); closeNow = false; @@ -175,7 +176,8 @@ public class TileAlfPortal extends TileMod { if(newMeta == 0) for(int i = 0; i < 36; i++) blockParticle(meta); - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); + if(!worldObj.isRemote) + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); } else if(explode) { worldObj.createExplosion(null, xCoord + .5, yCoord + 2.0, zCoord + .5, 3f, true); explode = false;