From a1d22b7d77ca891ca4d6f65c34554dea70efbf6c Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Thu, 21 May 2026 10:26:46 +0200 Subject: [PATCH] twast --- .../de/steamwar/fightsystem/utils/TechHiderWrapper.java | 9 +++++---- .../src/de/steamwar/techhider/ChunkHider.java | 8 ++++---- .../src/de/steamwar/techhider/TechHider.java | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java index 871d679e..1160b650 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java @@ -59,12 +59,12 @@ public class TechHiderWrapper extends StateDependent implements Listener { Set blocksToObfuscate = Config.GameModeConfig.Techhider.HiddenBlocks.stream() .map(CraftMagicNumbers::getBlock) .collect(Collectors.toUnmodifiableSet()); - Set> blockEntityTypeToObfuscate = Config.GameModeConfig.Techhider.HiddenBlockEntities.stream() + /* Set> blockEntityTypeToObfuscate = Config.GameModeConfig.Techhider.HiddenBlockEntities.stream() .map((id) -> { ResourceLocation loc = ResourceLocation.parse(id); return BuiltInRegistries.BLOCK_ENTITY_TYPE.get(loc).get().value(); }) - .collect(Collectors.toUnmodifiableSet()); + .collect(Collectors.toUnmodifiableSet()); */ techHider = new TechHider(CraftMagicNumbers.getBlock(Config.GameModeConfig.Techhider.ObfuscateWith)) { @Override public boolean isPlayerPrivilegedToAccessPosition(Player p, int blockX, int blockY, int blockZ) { @@ -84,8 +84,9 @@ public class TechHiderWrapper extends StateDependent implements Listener { @Override public boolean isPlayerPrivilegedToAccessBlocEntity(Player p, int blockX, int blockY, int blockZ, BlockEntityType type) { - Region hiddenRegion = getHiddenRegion(p); - return !hiddenRegion.inRegion(blockX, blockY, blockZ) || !blockEntityTypeToObfuscate.contains(type); + //Region hiddenRegion = getHiddenRegion(p); + //return !hiddenRegion.inRegion(blockX, blockY, blockZ) || !blockEntityTypeToObfuscate.contains(type); + return false; } @Override diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java index 3ba49d16..7262a6f4 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java @@ -62,10 +62,10 @@ public abstract class ChunkHider { private final byte BITS_PER_LONG = 64; - private final int blockIdUsedForHiding; + private final int blockIdUsedForHiding = 121; public ChunkHider(Block blockUsedForObfuscation) { - blockIdUsedForHiding = Block.BLOCK_STATE_REGISTRY.getId(blockUsedForObfuscation.defaultBlockState()); + // blockIdUsedForHiding = Block.BLOCK_STATE_REGISTRY.getId(blockUsedForObfuscation.defaultBlockState()); } private long[] readSectionDataFromBuffer(ByteBuf dataSource, short bitsPerEntry, int entryCount) { @@ -251,8 +251,8 @@ public abstract class ChunkHider { private static final Class blockEntitiyInfoClass = Reflection.getClass("net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData$BlockEntityInfo"); private static final Reflection.Field blockEntityInfoTypeField = Reflection.getField(blockEntitiyInfoClass, BlockEntityType.class, 0); - private static final Reflection.Field packedXZField = Reflection.getField(blockEntitiyInfoClass, Integer.class, 0); - private static final Reflection.Field yField = Reflection.getField(blockEntitiyInfoClass, Integer.class, 1); + private static final Reflection.Field packedXZField = Reflection.getField(blockEntitiyInfoClass, int.class, 0); + private static final Reflection.Field yField = Reflection.getField(blockEntitiyInfoClass, int.class, 1); private List filterBlockEntities(Player player, List blockEntities) { return blockEntities.stream() .filter((blockEntityInfo) -> { diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java index b889c3c1..013b02bf 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java @@ -475,7 +475,7 @@ public abstract class TechHider { }; } - private final Reflection.Field moveEntityPacketEntityIdField = Reflection.getField(ClientboundMoveEntityPacket.class, Integer.class, 0); + private final Reflection.Field moveEntityPacketEntityIdField = Reflection.getField(ClientboundMoveEntityPacket.class, int.class, 0); private Packet processMoveEntityPacket(Player player, ClientboundMoveEntityPacket packet) { int entityId = moveEntityPacketEntityIdField.get(packet); @@ -487,7 +487,7 @@ public abstract class TechHider { } } - private final Reflection.Field rotateHeadPacketEntityIdField = Reflection.getField(ClientboundRotateHeadPacket.class, Integer.class, 0); + private final Reflection.Field rotateHeadPacketEntityIdField = Reflection.getField(ClientboundRotateHeadPacket.class, int.class, 0); private Packet processRotateHeadPacket(Player player, ClientboundRotateHeadPacket packet) { int entityId = rotateHeadPacketEntityIdField.get(packet);