[Minor] Fix PR#1629 (#1741)

Author: NetsuNegi

CREDITS.md

@@ -397,7 +397,6 @@ This page lists all the individual contributions to the project by their author.
   - Enhanced reveal & gap warhead
   - Fix an issue that teleport units board transport vehicles on the bridge will create an impassable invisible barrier, which may cause the game to freeze or even crash
   - Fix wrong shadow when a vehicle has hover locomotor and is being lifted by `IsLocomotor=yes` warhead
-  - Fix the bug that a unit can overlap with `Teleport` units after it's been damaged by a fallen unit lifted by `IsLocomotor=yes` warheads
   - Customize parasite culling targets
   - Customize harvester dump amount
   - Select box logic

docs/Fixed-or-Improved-Logics.md

@@ -214,7 +214,6 @@ This page describes all ingame logics that are fixed or improved in Phobos witho
 - Fixed an issue that teleport units board transport vehicles on the bridge will create an impassable invisible barrier, which may cause the game to freeze or even crash.
 - Fixed an issue that moving MCV with Teleport locomotion will cause reconnection error.
 - Fixed wrong shadow when a vehicle has hover locomotor and is being lifted by `IsLocomotor=yes` warhead.
-- Fixed the bug that a unit can overlap with `Teleport` units after it's been damaged by a fallen unit lifted by `IsLocomotor=yes` warheads.
 - Fixed an issue that game crashes (EIP:7FB178) when infantry are about to enter an occupiable building that has been removed and is not real dead.
 - Fixed an issue that game crashes when spawnee has been removed and is not real dead.
 - Separated the AirstrikeClass pointer between the attacker/aircraft and the target to avoid erroneous overwriting issues.

docs/Whats-New.md

@@ -727,7 +727,6 @@ Vanilla fixes:
 - Fixed an issue that aircraft carriers cannot retract its spawned aircraft when on the bridge (by CrimRecya)
 - Fixed an issue where the shadow of jumpjet remained on the ground when it was above the elevated bridge (by CrimRecya)
 - Fixed an issue where AI would select unreachable buildings and get stuck when looking for buildings like tank bunkers, bio reactors, etc. (by TaranDahl)
-- Fixed the bug that a unit can overlap with `Teleport` units after it's been damaged by a fallen unit lifted by `IsLocomotor=yes` warheads (by NetsuNegi)
 - Fixed an issue that harvesters with amphibious movement zone can not automatically return to refineries with `WaterBound` on water surface (by NetsuNegi)
 - Fixed an issue that game crashes (EIP:7FB178) when infantry are about to enter an occupiable building that has been removed and is not real dead (by CrimRecya)
 - Fixed an issue that game crashes when spawnee has been removed and is not real dead (by CrimRecya)

src/Misc/Hooks.BugFixes.cpp

@@ -2014,38 +2014,39 @@ DEFINE_HOOK(0x73C43F, UnitClass_DrawAsVXL_Shadow_IsLocomotorFix2, 0x6)
 	return SkipGameCode;
 }
 
-namespace RemoveCellContentTemp
-{
-	bool CheckBeforeUnmark = false;
-}
-
-DEFINE_HOOK(0x737F74, UnitClass_ReceiveDamage_NowDead_MarkUp, 0x6)
-{
-	enum { SkipGameCode = 0x737F80 };
-
-	GET(UnitClass*, pThis, ESI);
-
-	RemoveCellContentTemp::CheckBeforeUnmark = true;
-	pThis->Mark(MarkType::Up);
-	RemoveCellContentTemp::CheckBeforeUnmark = false;
-
-	return SkipGameCode;
-}
-
-DEFINE_HOOK(0x47EAF7, CellClass_RemoveContent_BeforeUnmarkOccupationBits, 0x7)
-{
-	enum { ContinueCheck = 0x47EAFE, DontUnmark = 0x47EB8F };
-
-	GET(CellClass*, pCell, EDI);
-	GET_STACK(bool, onBridge, STACK_OFFSET(0x14, 0x8));
-
-	if (RemoveCellContentTemp::CheckBeforeUnmark && (onBridge ? pCell->AltObject : pCell->FirstObject))
-		return DontUnmark;
-
-	GET(ObjectClass*, pContent, ESI);
-	R->EAX(pContent->WhatAmI());
-	return ContinueCheck;
-}
+// These hooks cause invisible barrier in multiplayer games, when a tank destroyed in tank bunker, and then the bunker has been sold
+//namespace RemoveCellContentTemp
+//{
+//	bool CheckBeforeUnmark = false;
+//}
+//
+//DEFINE_HOOK(0x737F74, UnitClass_ReceiveDamage_NowDead_MarkUp, 0x6)
+//{
+//	enum { SkipGameCode = 0x737F80 };
+//
+//	GET(UnitClass*, pThis, ESI);
+//
+//	RemoveCellContentTemp::CheckBeforeUnmark = true;
+//	pThis->Mark(MarkType::Up);
+//	RemoveCellContentTemp::CheckBeforeUnmark = false;
+//
+//	return SkipGameCode;
+//}
+//
+//DEFINE_HOOK(0x47EAF7, CellClass_RemoveContent_BeforeUnmarkOccupationBits, 0x7)
+//{
+//	enum { ContinueCheck = 0x47EAFE, DontUnmark = 0x47EB8F };
+//
+//	GET(CellClass*, pCell, EDI);
+//	GET_STACK(bool, onBridge, STACK_OFFSET(0x14, 0x8));
+//
+//	if (RemoveCellContentTemp::CheckBeforeUnmark && (onBridge ? pCell->AltObject : pCell->FirstObject))
+//		return DontUnmark;
+//
+//	GET(ObjectClass*, pContent, ESI);
+//	R->EAX(pContent->WhatAmI());
+//	return ContinueCheck;
+//}
 
 DEFINE_HOOK(0x481778, CellClass_ScatterContent_Scatter, 0x6)
 {