Nav Blockers Fix

Fixed door nav blockers not ignoring disabled triggers, causing some issues in some TF2 maps.
Added a command to print nav blockers information.

Author: caxanga334

extension/mods/tf2/teamfortress2mod.cpp

@@ -270,6 +270,7 @@ void CTeamFortress2Mod::FireGameEvent(IGameEvent* event)
 		}
 		else if (strncasecmp(name, "teamplay_point_captured", 23) == 0)
 		{
+			TheNavMesh->ScheduleRecomputationOfInternalData(CNavMesh::RecomputeInternalDataReason::RECOMPUTEREASON_OBJECTIVE_UPDATED);
 			int pointID = event->GetInt("cp");
 			int teamWhoCapped = event->GetInt("team");
 			CBaseEntity* entity = GetControlPointByIndex(pointID);
@@ -1524,6 +1525,7 @@ void CTeamFortress2Mod::OnRoundStart()
 	};
 
 	extmanager->ForEachBot(func);
+	TheNavMesh->ScheduleRecomputationOfInternalData(CNavMesh::RecomputeInternalDataReason::RECOMPUTEREASON_RESET);
 }
 
 const TeamFortress2::TFObjectiveResource* CTeamFortress2Mod::GetTFObjectiveResource() const

extension/navmesh/nav_blocker.h

@@ -51,6 +51,10 @@ class INavBlocker
 	virtual void OnRecomputeInternalData() = 0;
 	// Return true if this blocker should be deleted when the nav mesh internal data is recomputed
 	virtual bool RemoveOnRecompute() = 0;
+	// The name of this blocker, for debugging purposes
+	virtual const char* GetName() = 0;
+	// Prints debug information to the console.
+	virtual void PrintDebugInfo() = 0;
 };
 
 /**
@@ -84,6 +88,8 @@ class CNavBlocker : public INavBlocker
 	bool IsBlocked(int teamID) { return true; }
 	void OnRecomputeInternalData() override {}
 	bool RemoveOnRecompute() override { return false; }
+	const char* GetName() override { return "CNavBlocker"; }
+	void PrintDebugInfo() override {}
 
 protected:
 	std::vector<AreaType*> m_areas;

extension/navmesh/nav_blocker_door.cpp

@@ -77,6 +77,14 @@ bool CDoorNavBlocker::IsBlocked(int teamID)
 	return m_blocked;
 }
 
+void CDoorNavBlocker::PrintDebugInfo()
+{
+	META_CONPRINTF("Door: %s\n", UtilHelpers::textformat::FormatEntity(m_door.Get()));
+	META_CONPRINTF("Trigger: %s\n", UtilHelpers::textformat::FormatEntity(m_trigger.Get()));
+	META_CONPRINTF("Filter: %s\n", UtilHelpers::textformat::FormatEntity(m_filter.Get()));
+	META_CONPRINTF("Team Only: %s Team: %i\n", UtilHelpers::textformat::FormatBool(m_teamOnly), m_teamNum);
+}
+
 void CDoorNavBlocker::UpdateDoor()
 {
 	CBaseEntity* door = m_door.Get();
@@ -108,6 +116,15 @@ void CDoorNavBlocker::UpdateDoor()
 	auto func = [&targetname, &trigger](int index, edict_t* edict, CBaseEntity* entity) {
 		if (entity)
 		{
+			bool disabled = false;
+			entprops->GetEntPropBool(entity, Prop_Data, "m_bDisabled", disabled);
+
+			// some doors (IE: pl_goldrush) have one trigger per team
+			if (disabled)
+			{
+				return true; // skip, continue loop
+			}
+
 			if (UtilHelpers::io::IsConnectedTo(entity, targetname))
 			{
 				trigger = entity;

extension/navmesh/nav_blocker_door.h

@@ -31,6 +31,8 @@ class CDoorNavBlocker : public CNavBlocker<CNavArea>
 	void Update() override;
 	bool IsBlocked(int teamID) override;
 	bool RemoveOnRecompute() override { return true; }
+	const char* GetName() override { return "CDoorNavBlocker"; }
+	void PrintDebugInfo() override;
 
 protected:
 	DoorType m_doortype;

extension/navmesh/nav_mesh.cpp

@@ -4686,6 +4686,16 @@ void NavNotifyClientsOfReload::operator()(CBaseExtPlayer* player)
 	}
 }
 
+void CNavMesh::CommandNavDebugAutoBlockers()
+{
+	std::for_each(m_navblockers.begin(), m_navblockers.end(), [](std::unique_ptr<INavBlocker>& blocker) {
+		META_CONPRINTF("Nav Blocker: \"%s\". Valid: %s. Status (ANY TEAM): %s \n",
+			blocker->GetName(), 
+			UtilHelpers::textformat::FormatBool(blocker->IsValid()), 
+			blocker->IsBlocked(NAV_TEAM_ANY) ? "BLOCKED" : "UNBLOCKED");
+		blocker->PrintDebugInfo();
+	});
+}
 
 CON_COMMAND_F(sm_nav_import, "Imports an existing official navigation mesh.", FCVAR_GAMEDLL | FCVAR_CHEAT)
 {
@@ -4696,3 +4706,8 @@ CON_COMMAND_F(sm_nav_rcbot2_import, "Imports waypoints from RCBot2", FCVAR_GAMED
 {
 	TheNavMesh->ImportWaypointsFromRCBot2();
 }
+
+CON_COMMAND_F(sm_nav_debug_blockers, "Shows debug information of nav blockers.", FCVAR_GAMEDLL | FCVAR_CHEAT)
+{
+	TheNavMesh->CommandNavDebugAutoBlockers();
+}

extension/navmesh/nav_mesh.h

@@ -655,6 +655,7 @@ class CNavMesh : public CEventListenerHelper
 	void CommandNavReloadMesh();										// Saves the navigation mesh and reloads it
 	void CommandNavMeasureDistance();									// Measures the distance between two nav areas
 	void CommandNavDumpToKeyValues();									// Dumps nav mesh data to a KV file
+	void CommandNavDebugAutoBlockers();									// Debug automatic nav blockers
 
 	void AddToDragSelectionSet( CNavArea *pArea );
 	void RemoveFromDragSelectionSet( CNavArea *pArea );