Configure player poses shrinking collision box

Samsuik · Mar 14, 2024 · a8387cf · a8387cf
1 parent 8fe48d3
commit a8387cf
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/patches/server/0004-Sakura-Configuration-Files.patch b/patches/server/0004-Sakura-Configuration-Files.patch
@@ -645,10 +645,10 @@ index 0000000000000000000000000000000000000000..04dc81634277d05894076a2cafde60ca
 +}
 diff --git a/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b842875145a5a7659309256cfb8b275dee82d532
+index 0000000000000000000000000000000000000000..f2b89b76f487b98b79fbd33e7564e210504a8e10
 --- /dev/null
 +++ b/src/main/java/me/samsuik/sakura/configuration/WorldConfiguration.java
-@@ -0,0 +1,189 @@
+@@ -0,0 +1,192 @@
 +package me.samsuik.sakura.configuration;
 +
 +import com.mojang.logging.LogUtils;
@@ -793,6 +793,9 @@ index 0000000000000000000000000000000000000000..b842875145a5a7659309256cfb8b275d
 +            @Comment("Received by attacking a shielded enemy")
 +            public double shieldHitKnockback = 0.5;
 +        }
++
++        @Comment("Prevents players swimming using elytra or riptide to enter holes")
++        public boolean posesShrinkCollisionBox = true;
 +    }
 +
 +    public Entity entity;

diff --git a/patches/server/0065-Disable-player-poses-shrinking-collision-box.patch b/patches/server/0065-Disable-player-poses-shrinking-collision-box.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samsuik <[email protected]>
+Date: Thu, 14 Mar 2024 19:51:20 +0000
+Subject: [PATCH] Disable player poses shrinking collision box
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index 127b83d92719fb5149d936125423a509779e577d..b0dd1e699e743ed9fa7bd7499d81d813be89d3f2 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -2243,7 +2243,13 @@ public abstract class Player extends LivingEntity {
+
+     @Override
+     public EntityDimensions getDimensions(Pose pose) {
+-        return (EntityDimensions) Player.POSES.getOrDefault(pose, Player.STANDING_DIMENSIONS);
++        // Sakura start - player poses shrink collision box
++        EntityDimensions dimensions = (EntityDimensions) Player.POSES.getOrDefault(pose, Player.STANDING_DIMENSIONS);
++        if (!level().sakuraConfig().players.posesShrinkCollisionBox && dimensions.height == 0.6f) {
++            dimensions = Player.STANDING_DIMENSIONS;
++        }
++        return dimensions;
++        // Sakura end - player poses shrink collision box
+     }
+
+     @Override