Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

onPlayerTeamChange Event #3370

Merged
merged 13 commits into from
May 23, 2024
Merged

onPlayerTeamChange Event #3370

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
66a7050
Update CStaticFunctionDefinitions.cpp
esmail9900 Apr 21, 2024
81169b3
Added onPlayerTeamChange Event
esmail9900 Apr 21, 2024
29932fe
Update CStaticFunctionDefinitions.cpp
esmail9900 Apr 21, 2024
c9cfb84
Update CStaticFunctionDefinitions.cpp
esmail9900 Apr 21, 2024
40f507b
Update CStaticFunctionDefinitions.cpp
esmail9900 Apr 21, 2024
b5fb1e8
Update CStaticFunctionDefinitions.cpp
esmail9900 Apr 21, 2024
14ba5c6
Adjust code formatting for readability
esmail9900 Apr 22, 2024
0d9c2a1
Improve code readability
esmail9900 Apr 23, 2024
1369efa
Fixed Readability
esmail9900 Apr 23, 2024
1c18cb6
Fixed Readability
esmail9900 Apr 23, 2024
c603b01
Update CStaticFunctionDefinitions.cpp
esmail9900 Apr 27, 2024
734f78c
missed semicolon
esmail9900 May 6, 2024
7bdc0c2
Merge branch 'master' into master
Dutchman101 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Server/mods/deathmatch/logic/CGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,6 +1589,7 @@ void CGame::AddBuiltInEvents()
m_Events.AddEvent("onPlayerProjectileCreation", "weaponType, posX, posY, posZ, force, target, rotX, rotY, rotZ, velX, velY, velZ", nullptr, false);
m_Events.AddEvent("onPlayerDetonateSatchels", "", nullptr, false);
m_Events.AddEvent("onPlayerTriggerEventThreshold", "", nullptr, false);
m_Events.AddEvent("onPlayerTeamChange", "oldTeam, newTeam", nullptr, false);

// Ped events
m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);
Expand Down
14 changes: 12 additions & 2 deletions Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9203,13 +9203,23 @@ bool CStaticFunctionDefinitions::SetTeamColor(CTeam* pTeam, unsigned char ucRed,
bool CStaticFunctionDefinitions::SetPlayerTeam(CPlayer* pPlayer, CTeam* pTeam)
{
assert(pPlayer);

CTeam* currentTeam = pPlayer->GetTeam();
esmail9900 marked this conversation as resolved.
Show resolved Hide resolved
// If its a different team
if (pTeam != pPlayer->GetTeam())
if (pTeam != currentTeam)
{
// Change his team
pPlayer->SetTeam(pTeam, true);

// Call the Event
CLuaArguments Arguments;
if (currentTeam){
Arguments.PushString(currentTeam->GetTeamName());
} else {
Arguments.PushBoolean(false);
}
Arguments.PushString(pTeam->GetTeamName());
pPlayer->CallEvent("onPlayerTeamChange", Arguments);

esmail9900 marked this conversation as resolved.
Show resolved Hide resolved
// Tell everyone his new team
CBitStream BitStream;
BitStream.pBitStream->Write(pTeam ? pTeam->GetID() : INVALID_ELEMENT_ID);
Expand Down