From 3f67c3328a84d3429b1ab189e0ecd313caf0de60 Mon Sep 17 00:00:00 2001 From: somehussar <148253652+somehussar@users.noreply.github.com> Date: Sun, 13 Sep 2026 03:24:56 +0200 Subject: [PATCH] Make sure ID matches up --- .../network/packets/request/TileEntitySavePacket.java | 5 +++++ .../java/noppes/npcs/blocks/tiles/ITilePermission.java | 9 +++++++++ src/main/resources/META-INF/customnpcs_at.cfg | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java index 0068bf407..f0ed65c81 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/TileEntitySavePacket.java @@ -75,11 +75,16 @@ public final class TileEntitySavePacket extends AbstractPacket { int x = incomingCompound.getInteger("x"); int y = incomingCompound.getInteger("y"); int z = incomingCompound.getInteger("z"); + String id = incomingCompound.getString("id"); + TileEntity tile = player.worldObj.getTileEntity(x, y, z); if (tile == null) return false; + if (!ITilePermission.doesIDMatch(tile.getClass(), id)) + return false; + boolean validatesPacket = tile instanceof ITilePermission; if (!validatesPacket) { LogWriter.error(String.format("%s tried to use TileEntitySavePacket on %s -- should this class implement ITileValidityChecker??", player.getCommandSenderName(), tile)); diff --git a/src/main/java/noppes/npcs/blocks/tiles/ITilePermission.java b/src/main/java/noppes/npcs/blocks/tiles/ITilePermission.java index 769658168..54a728ae3 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/ITilePermission.java +++ b/src/main/java/noppes/npcs/blocks/tiles/ITilePermission.java @@ -1,8 +1,17 @@ package noppes.npcs.blocks.tiles; +import net.minecraft.tileentity.TileEntity; import noppes.npcs.CustomNpcsPermissions; public interface ITilePermission { CustomNpcsPermissions.Permission getPermission(); + + static boolean doesIDMatch(Class tileClass, String givenID) { + if (givenID == null) + return false; + + Object entry = TileEntity.classToNameMap.get(tileClass); + return givenID.equals(entry); + } } diff --git a/src/main/resources/META-INF/customnpcs_at.cfg b/src/main/resources/META-INF/customnpcs_at.cfg index a41eb23c9..083237c2b 100644 --- a/src/main/resources/META-INF/customnpcs_at.cfg +++ b/src/main/resources/META-INF/customnpcs_at.cfg @@ -26,3 +26,7 @@ public net.minecraft.client.Minecraft field_147126_aw # mcMusicTicker public net.minecraft.client.audio.MusicTicker field_147676_d # timeUntilNextMusic #GuiScreen public net.minecraft.client.gui.GuiScreen field_146290_a # selectedButton + + +# TileEntity +public net.minecraft.tileentity.TileEntity field_145853_j