From 673f832c2d9549e92ea2b90c2fc8335278e88583 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Thu, 3 Sep 2026 13:00:46 +0800 Subject: [PATCH] fix PacketTeleport sanitizer false positive (#253) --- .../crazypants/enderio/network/PacketUtil.java | 14 ++++++++++---- .../enderio/teleport/telepad/PacketTeleport.java | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/main/java/crazypants/enderio/network/PacketUtil.java b/src/main/java/crazypants/enderio/network/PacketUtil.java index f01e8f7b..f0ca0f68 100644 --- a/src/main/java/crazypants/enderio/network/PacketUtil.java +++ b/src/main/java/crazypants/enderio/network/PacketUtil.java @@ -26,27 +26,33 @@ public class PacketUtil { if (!(container instanceof IContainerWithTileEntity)) { Log.LOGGER.warn( Log.securityMarker, - "Player {} tried to send {} while not opening correct GUI. Target TileEntity at {}, {}, {}", + "Player {} tried to send {} while not opening correct GUI. Target TileEntity {} at {}, {}, {} in {}. Current container {}", player.getGameProfile(), messageClass.getSimpleName(), + receivedTile, receivedTile.xCoord, receivedTile.yCoord, - receivedTile.zCoord); + receivedTile.zCoord, + receivedTile.getWorldObj().provider.dimensionId, + container); return true; } TileEntity expectedTile = ((IContainerWithTileEntity) container).getTileEntity(); if (receivedTile != expectedTile) { Log.LOGGER.warn( Log.securityMarker, - "Player {} tried to send {} which attempts to modify setting of TileEntity at {}, {}, {}. Expected: {}, {}, {}", + "Player {} tried to send {} which attempts to modify setting of TileEntity at {}, {}, {} in {}. Expected: {}, {}, {} in {}. Current container {}", player.getGameProfile(), messageClass.getSimpleName(), receivedTile.xCoord, receivedTile.yCoord, receivedTile.zCoord, + receivedTile.getWorldObj().provider.dimensionId, expectedTile.xCoord, expectedTile.yCoord, - expectedTile.zCoord); + expectedTile.zCoord, + expectedTile.getWorldObj().provider.dimensionId, + container); return true; } return false; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java index 6c319c70..06a54b4f 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java @@ -59,9 +59,19 @@ public class PacketTeleport extends MessageTileEntity @Override public IMessage onMessage(PacketTeleport message, MessageContext ctx) { - World world = ctx.side.isClient() ? EnderIO.proxy.getClientWorld() : message.getWorld(ctx); + boolean isClient = ctx.side.isClient(); + World world = isClient ? EnderIO.proxy.getClientWorld() : message.getWorld(ctx); TileTelePad te = message.getTileEntity(world); - if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + if (te == null) return null; + if (!isClient) { + // BEGIN is the only type of PacketTeleport that originates from a TE GUI + if (message.type == Type.BEGIN && PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) { + return null; + } + // TELEPORT is never sent to server + if (message.type == Type.TELEPORT) return null; + // other types are sent in background without a gui, so no checks + } Entity e = world.getEntityByID(message.entityId); switch (message.type) { case BEGIN: