OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-12-16 18:10:05 +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

9
src/Combat.cpp
View File

@@ -269,11 +269,10 @@ void Combat::npcAttackPc(Mob *mob, time_t currTime) {
* set of rolls.
*/
void Combat::genQItemRolls(Player *leader, std::map<int, int>& rolls) {
for (int i = 0; i < leader->groupCnt; i++) {
if (leader->groupIDs[i] == 0)
continue;
auto players = (*leader->group)[EntityKind::PLAYER];
for (int i = 0; i < players.size(); i++) {
CNSocket *otherSock = PlayerManager::getSockFromID(leader->groupIDs[i]);
CNSocket *otherSock = players[i].sock;
if (otherSock == nullptr)
continue;
@@ -679,7 +678,7 @@ static void playerTick(CNServer *serv, time_t currTime) {
bool transmit = false;
// group ticks
if (plr->groupCnt > 1)
if (plr->group != nullptr)
Groups::groupTickInfo(plr);
// do not tick dead players