diff options
| -rw-r--r-- | src/game-server/accountconnection.cpp | 4 | ||||
| -rw-r--r-- | src/game-server/monster.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp index ccfd37bf..43c4f20d 100644 --- a/src/game-server/accountconnection.cpp +++ b/src/game-server/accountconnection.cpp @@ -135,10 +135,10 @@ void AccountConnection::processMessage(MessageIn &msg) case CGMSG_CHANGED_PARTY: { - // Party id, 0 for none - int partyid = msg.readLong(); // Character DB id int charid = msg.readLong(); + // Party id, 0 for none + int partyid = msg.readLong(); gameHandler->updateCharacter(charid, partyid); } break; diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp index 582dabed..b8333e40 100644 --- a/src/game-server/monster.cpp +++ b/src/game-server/monster.cpp @@ -339,7 +339,7 @@ int Monster::damage(Object *source, Damage const &damage) if (damage.usedSkill) { mExpReceivers[s].insert(damage.usedSkill); - if (!mOwnerTimer || mOwner == s /*TODO: || mOwner->getParty() == s->getParty() */) + if (!mOwnerTimer || mOwner == s || mOwner->getParty() == s->getParty()) { mOwner = s; mLegalExpReceivers.insert(s); |