Add bundle packet handling

2026-05-21 18:20:15 +02:00
parent 32fd4b4630
commit 29106d5bb5
3 changed files with 47 additions and 35 deletions
@@ -140,18 +140,6 @@ public class HullHider implements Listener {
        return false;
    }

-    public boolean blockPrecise(Player player, int chunkX, int chunkY, int chunkZ) {
-        if (!TechHiderWrapper.ENABLED) return false;
-
-        for (Hull hull : hulls) {
-            if (hull.blockPrecise(player, chunkX, chunkY, chunkZ)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onSpawn(EntitySpawnEvent e) {
        for (Hull hull : hulls) {
@@ -37,6 +37,7 @@ import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -89,10 +90,16 @@ public class TechHiderWrapper extends StateDependent implements Listener {
                return !hiddenRegion.inRegion(blockX, blockY, blockZ) || !blocksToObfuscate.contains(block);
            }

-            // TODO
            @Override
            public boolean isPlayerPrivilegedToAccessEntity(Player p, int entityId) {
-                return true;
+                net.minecraft.world.entity.Entity nmsEntity =  ((CraftWorld) p.getWorld()).getHandle().moonrise$getEntityLookup().get(entityId);
+
+                if(nmsEntity != null) {
+                    return !hullHider.isBlockHidden(p, nmsEntity.getBlockX(), nmsEntity.getBlockY(), nmsEntity.getBlockZ());
+                }
+                else {
+                    return false;
+                }
            }

            @Override