From ab9a7ae8319e8d6133a555b5c6010e10919b36cb Mon Sep 17 00:00:00 2001
From: disintegrate <oleajascha@gmail.com>
Date: Wed, 18 Mar 2026 17:00:50 +0800
Subject: [PATCH] Added a check if trapdoor is attached.

Just incase if neighborChanged is modified.
---
 Minecraft.World/LivingEntity.cpp | 10 +++-------
 Minecraft.World/TrapDoorTile.cpp | 15 +++++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Minecraft.World/LivingEntity.cpp b/Minecraft.World/LivingEntity.cpp
index 2a5982b8a..7876e88c4 100644
--- a/Minecraft.World/LivingEntity.cpp
+++ b/Minecraft.World/LivingEntity.cpp
@@ -994,19 +994,15 @@ bool LivingEntity::onLadder()
 		return true;
 	case Tile::trapdoor_Id: // hexagonny - add climbable (opened) trapdoors
 	{
-		int data = level->getData(xt, yt, zt);
-		bool isOpen = (data & 0x4) != 0;
-		if (isOpen)
+		if ((level->getData(xt, yt, zt) & 0x4) != 0)
 		{
-			int aboveTile = level->getTile(xt, yt + 1, zt);
-			int belowTile = level->getTile(xt, yt - 1, zt);
-			switch (aboveTile)
+			switch (level->getTile(xt, yt + 1, zt))
 			{
 			case Tile::ladder_Id:
 			case Tile::vine_Id:
 				return false; // Opened trapdoor should only be climbable when it's only at the top.
 			default:
-				return belowTile == Tile::ladder_Id;
+				return level->getTile(xt, yt - 1, zt) == Tile::ladder_Id;
 			}
 		}
 		break;
diff --git a/Minecraft.World/TrapDoorTile.cpp b/Minecraft.World/TrapDoorTile.cpp
index af00275fe..173435b84 100644
--- a/Minecraft.World/TrapDoorTile.cpp
+++ b/Minecraft.World/TrapDoorTile.cpp
@@ -51,14 +51,17 @@ AABB *TrapDoorTile::getTileAABB(Level *level, int x, int y, int z)
 AABB *TrapDoorTile::getAABB(Level *level, int x, int y, int z)
 {
 	int data = level->getData(x, y, z);
-	bool isOpen = (data & 0x4) != 0;
-
-	if (isOpen)
+	if (isOpen(data))
 	{
-		int belowTile = level->getTile(x, y - 1, z);
-		if (belowTile == Tile::ladder_Id)
+		int xt = x, zt = z;
+		if ((data & 3) == 0) zt++;
+		if ((data & 3) == 1) zt--;
+		if ((data & 3) == 2) xt++;
+		if ((data & 3) == 3) xt--;
+
+		if (level->getTile(x, y - 1, z) == Tile::ladder_Id && attachesTo(level->getTile(xt, y, zt)))
 		{
-			return nullptr; // No collision when open above ladder
+			return nullptr; // No collision when open above ladder (add is attached to a block)
 		}
 	}
 	// Default behaviour