Fix Wall Tester Signs clipping players in ceiling

Fixes #2
NucleoidMC · Oct 17, 2024 · 5a1640f · 5a1640f
1 parent 3a6208d
commit 5a1640f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/me/ellieis/Sabotage/game/custom/blocks/BaseTesterSign.java b/src/main/java/me/ellieis/Sabotage/game/custom/blocks/BaseTesterSign.java
@@ -14,13 +14,13 @@
 import net.minecraft.world.World;
 
 public class BaseTesterSign  {
-    public static void onUse(World world, PlayerEntity player, BlockHitResult hit) {
+    public static void onUse(World world, PlayerEntity player, BlockPos pos) {
         if (!world.isClient()) {
             ServerPlayerEntity plr = (ServerPlayerEntity) player;
 
             for (SabotageActive game : Sabotage.activeGames) {
                 if (game.getWorld().equals(world)) {
-                    if (!game.testEntity(plr, hit.getBlockPos().toCenterPos())) {
+                    if (!game.testEntity(plr, pos.toCenterPos())) {
                         plr.sendMessage(Text.translatable("sabotage.tester.fail").formatted(Formatting.YELLOW));
                     }
                     break;

diff --git a/src/main/java/me/ellieis/Sabotage/game/custom/blocks/TesterSign.java b/src/main/java/me/ellieis/Sabotage/game/custom/blocks/TesterSign.java
@@ -32,7 +32,7 @@ public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable Livi
 
     @Override
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-        BaseTesterSign.onUse(world, player, hit);
+        BaseTesterSign.onUse(world, player, pos);
         return ActionResult.FAIL;
     }
 

diff --git a/src/main/java/me/ellieis/Sabotage/game/custom/blocks/WallTesterSign.java b/src/main/java/me/ellieis/Sabotage/game/custom/blocks/WallTesterSign.java
@@ -20,6 +20,7 @@
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
@@ -42,7 +43,8 @@ public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable Livi
 
     @Override
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
-        BaseTesterSign.onUse(world, player, hit);
+
+        BaseTesterSign.onUse(world, player, pos.subtract(new Vec3i(0, 1, 0)));
         return ActionResult.FAIL;
     }