Merge pull request #8281 from ChillerDragon/pr_fix_triggeredevents7

Make sixup TriggeredEvents reliable

src/game/server/entities/character.cpp

@@ -28,6 +28,7 @@ CCharacter::CCharacter(CGameWorld *pWorld, CNetObj_PlayerInput LastInput) :
 {
 	m_Health = 0;
 	m_Armor = 0;
+	m_TriggeredEvents7 = 0;
 	m_StrongWeakId = 0;
 
 	m_Input = LastInput;
@@ -861,6 +862,17 @@ void CCharacter::TickDeferred()
 
 		if(Events & COREEVENT_HOOK_HIT_NOHOOK)
 			GameServer()->CreateSound(m_Pos, SOUND_HOOK_NOATTACH, TeamMaskExceptSelf);
+
+		if(Events & COREEVENT_GROUND_JUMP)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_GROUND_JUMP;
+		if(Events & COREEVENT_AIR_JUMP)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_AIR_JUMP;
+		if(Events & COREEVENT_HOOK_ATTACH_PLAYER)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_PLAYER;
+		if(Events & COREEVENT_HOOK_ATTACH_GROUND)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_GROUND;
+		if(Events & COREEVENT_HOOK_HIT_NOHOOK)
+			m_TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_HIT_NOHOOK;
 	}
 
 	if(m_pPlayer->GetTeam() == TEAM_SPECTATORS)
@@ -1122,18 +1134,7 @@ void CCharacter::SnapCharacter(int SnappingClient, int Id)
 
 		pCharacter->m_Health = Health;
 		pCharacter->m_Armor = Armor;
-		int TriggeredEvents7 = 0;
+		pCharacter->m_TriggeredEvents = m_TriggeredEvents7;
-		if(m_Core.m_TriggeredEvents & COREEVENT_GROUND_JUMP)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_GROUND_JUMP;
-		if(m_Core.m_TriggeredEvents & COREEVENT_AIR_JUMP)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_AIR_JUMP;
-		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_PLAYER)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_PLAYER;
-		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_ATTACH_GROUND)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_ATTACH_GROUND;
-		if(m_Core.m_TriggeredEvents & COREEVENT_HOOK_HIT_NOHOOK)
-			TriggeredEvents7 |= protocol7::COREEVENTFLAG_HOOK_HIT_NOHOOK;
-		pCharacter->m_TriggeredEvents = TriggeredEvents7;
 	}
 }
 
@@ -1277,6 +1278,11 @@ void CCharacter::Snap(int SnappingClient)
 	pDDNetCharacter->m_TargetY = m_Core.m_Input.m_TargetY;
 }
 
+void CCharacter::PostSnap()
+{
+	m_TriggeredEvents7 = 0;
+}
+
 // DDRace
 
 bool CCharacter::CanCollide(int ClientId)

src/game/server/entities/character.h

@@ -38,6 +38,7 @@ public:
 	void TickDeferred() override;
 	void TickPaused() override;
 	void Snap(int SnappingClient) override;
+	void PostSnap() override;
 	void SwapClients(int Client1, int Client2) override;
 
 	bool CanSnapCharacter(int SnappingClient);
@@ -144,6 +145,8 @@ private:
 	int m_Health;
 	int m_Armor;
 
+	int m_TriggeredEvents7;
+
 	// the player core for the physics
 	CCharacterCore m_Core;
 	CGameTeams *m_pTeams = nullptr;

src/game/server/entity.h

@@ -122,6 +122,12 @@ public: // TODO: Maybe make protected
 	*/
 	virtual void Snap(int SnappingClient) {}
 
+	/*
+		Function: PostSnap
+			Called after all clients received their snapshot.
+	*/
+	virtual void PostSnap() {}
+
 	/*
 		Function: SwapClients
 			Called when two players have swapped their client ids.

src/game/server/gamecontext.cpp

@@ -4235,6 +4235,7 @@ void CGameContext::OnSnap(int ClientId)
 void CGameContext::OnPreSnap() {}
 void CGameContext::OnPostSnap()
 {
+	m_World.PostSnap();
 	m_Events.Clear();
 }
 

src/game/server/gameworld.cpp

@@ -129,6 +129,19 @@ void CGameWorld::Snap(int SnappingClient)
 	}
 }
 
+void CGameWorld::PostSnap()
+{
+	for(auto *pEnt : m_apFirstEntityTypes)
+	{
+		for(; pEnt;)
+		{
+			m_pNextTraverseEntity = pEnt->m_pNextTypeEntity;
+			pEnt->PostSnap();
+			pEnt = m_pNextTraverseEntity;
+		}
+	}
+}
+
 void CGameWorld::Reset()
 {
 	// reset all entities

src/game/server/gameworld.h

@@ -133,6 +133,12 @@ public:
 	*/
 	void Snap(int SnappingClient);
 
+	/*
+		Function: PostSnap
+			Called after all clients received their snapshot.
+	*/
+	void PostSnap();
+
 	/*
 		Function: Tick
 			Calls Tick on all the entities in the world to progress