Fixed #2821

MohistMC · Jan 22, 2024 · cd6166b · cd6166b
1 parent 6f61b48
commit cd6166b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/patches/minecraft/net/minecraft/entity/Entity.java.patch b/patches/minecraft/net/minecraft/entity/Entity.java.patch
@@ -996,7 +996,7 @@
        if (entitysize1.field_220315_a < entitysize.field_220315_a) {
           double d0 = (double)entitysize1.field_220315_a / 2.0D;
           this.func_174826_a(new AxisAlignedBB(this.func_226277_ct_() - d0, this.func_226278_cu_(), this.func_226281_cx_() - d0, this.func_226277_ct_() + d0, this.func_226278_cu_() + (double)entitysize1.field_220316_b, this.func_226281_cx_() + d0));
-@@ -2363,7 +_,7 @@
+@@ -2363,24 +_,58 @@
     }
 
     protected AxisAlignedBB func_213321_d(Pose p_213321_1_) {
@@ -1005,9 +1005,15 @@
        float f = entitysize.field_220315_a / 2.0F;
        Vector3d vector3d = new Vector3d(this.func_226277_ct_() - (double)f, this.func_226278_cu_(), this.func_226281_cx_() - (double)f);
        Vector3d vector3d1 = new Vector3d(this.func_226277_ct_() + (double)f, this.func_226278_cu_() + (double)entitysize.field_220316_b, this.func_226281_cx_() + (double)f);
-@@ -2371,16 +_,44 @@
+       return new AxisAlignedBB(vector3d, vector3d1);
     }
 
++   // Mohist start
++   public void a(AxisAlignedBB p_174826_1_) {
++      func_174826_a(p_174826_1_);
++   }
++   // Mohist end
++
     public void func_174826_a(AxisAlignedBB p_174826_1_) {
 -      this.field_70121_D = p_174826_1_;
 +      // CraftBukkit start - block invalid bounding boxes

diff --git a/src/main/resources/mappings/spigot2srg.srg b/src/main/resources/mappings/spigot2srg.srg
@@ -24295,7 +24295,6 @@ MD: net/minecraft/server/Entity/a (FI)V net/minecraft/entity/Entity/func_208000_
 MD: net/minecraft/server/Entity/a (FLnet/minecraft/server/Vec3D;)V net/minecraft/entity/Entity/func_213309_a (FLnet/minecraft/util/math/vector/Vector3d;)V
 MD: net/minecraft/server/Entity/a (Ljava/lang/Class;)Z net/minecraft/entity/Entity/func_205708_a (Ljava/lang/Class;)Z
 MD: net/minecraft/server/Entity/a (Lnet/minecraft/server/ArgumentAnchor$Anchor;Lnet/minecraft/server/Vec3D;)V net/minecraft/entity/Entity/func_200602_a (Lnet/minecraft/command/arguments/EntityAnchorArgument$Type;Lnet/minecraft/util/math/vector/Vector3d;)V
-MD: net/minecraft/server/Entity/a (Lnet/minecraft/server/AxisAlignedBB;)V net/minecraft/entity/Entity/func_174826_a (Lnet/minecraft/util/math/AxisAlignedBB;)V
 MD: net/minecraft/server/Entity/a (Lnet/minecraft/server/BlockPosition;Lnet/minecraft/server/IBlockData;)Z net/minecraft/entity/Entity/func_242278_a (Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)Z
 MD: net/minecraft/server/Entity/a (Lnet/minecraft/server/ChatModifier;)Lnet/minecraft/server/ChatModifier; net/minecraft/entity/Entity/func_211516_a_ (Lnet/minecraft/util/text/Style;)Lnet/minecraft/util/text/Style;
 MD: net/minecraft/server/Entity/a (Lnet/minecraft/server/DataWatcherObject;)V net/minecraft/entity/Entity/func_184206_a (Lnet/minecraft/network/datasync/DataParameter;)V