From 24f3bcd17e2ac324abf1d47af803cbba3dcae59c Mon Sep 17 00:00:00 2001
From: KJeff01 <kjeff1997@gmail.com>
Date: Fri, 9 Feb 2024 14:29:12 -0600
Subject: [PATCH] Limit pickup events to half a tile height differences

---
 src/move.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/move.cpp b/src/move.cpp
index a44544f0e10..3a2ae0fff0b 100644
--- a/src/move.cpp
+++ b/src/move.cpp
@@ -2026,6 +2026,7 @@ static void checkLocalFeatures(DROID *psDroid)
 
 	// scan the neighbours
 #define DROIDDIST ((TILE_UNITS*5)/2)
+	constexpr int MAX_PICKUP_DISTANCE = (TILE_UNITS / 2);
 	static GridList gridList;  // static to avoid allocations.
 	gridList = gridStartIterate(psDroid->pos.x, psDroid->pos.y, DROIDDIST);
 	for (GridIterator gi = gridList.begin(); gi != gridList.end(); ++gi)
@@ -2035,6 +2036,11 @@ static void checkLocalFeatures(DROID *psDroid)
 
 		if (psObj->type == OBJ_FEATURE && !psObj->died)
 		{
+			if (std::abs(psDroid->pos.z - psObj->pos.z) > MAX_PICKUP_DISTANCE)
+			{
+				continue; // Don't pickup if height difference is more than half of a tile.
+			}
+
 			switch (((FEATURE *)psObj)->psStats->subType)
 			{
 			case FEAT_OIL_DRUM: