OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-27 22:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(WIP) EXPERIMENTAL GROUP CHANGES

Browse Source
This commit is contained in:
gsemaj
2022-04-22 21:13:00 -04:00
parent 04221f1c5f
commit 710300c04c
10 changed files with 177 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/PlayerManager.cpp
View File

@@ -41,7 +41,7 @@ void PlayerManager::removePlayer(CNSocket* key) {
Player* plr = getPlayer(key);
uint64_t fromInstance = plr->instanceID;
Groups::groupKickPlayer(plr);
Groups::groupKick(plr);
// remove player's bullets
Combat::Bullets.erase(plr->iID);
@@ -232,8 +232,7 @@ static void enterPlayer(CNSocket* sock, CNPacketData* data) {
Database::getPlayer(plr, lm->playerId);
}
plr->groupCnt = 1;
plr->iIDGroup = plr->groupIDs[0] = plr->iID;
plr->group = nullptr;
response.iID = plr->iID;
response.uiSvrTime = getTime();
@@ -474,9 +473,8 @@ static void revivePlayer(CNSocket* sock, CNPacketData* data) {
resp2.PCRegenDataForOtherPC.iHP = plr->HP;
resp2.PCRegenDataForOtherPC.iAngle = plr->angle;
Player *otherPlr = getPlayerFromID(plr->iIDGroup);
if (otherPlr != nullptr) {
int bitFlag = Groups::getGroupFlags(otherPlr);
if (plr->group != nullptr) {
int bitFlag = plr->group->conditionBitFlag;
resp2.PCRegenDataForOtherPC.iConditionBitFlag = plr->iConditionBitFlag = plr->iSelfConditionBitFlag | bitFlag;
resp2.PCRegenDataForOtherPC.iPCState = plr->iPCState;