diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-20 14:30:06 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-20 14:30:06 +0000 |
| commit | f06a44d501c7eac4931811b434213e489bc6ef28 (patch) | |
| tree | daf50dca11fdbaccce767ce05c9fee143bdc3bd5 | |
| parent | ee7973243ce46493377a8554e7b8bd105ed7b917 (diff) | |
| download | hercules-f06a44d501c7eac4931811b434213e489bc6ef28.tar.gz hercules-f06a44d501c7eac4931811b434213e489bc6ef28.tar.bz2 hercules-f06a44d501c7eac4931811b434213e489bc6ef28.tar.xz hercules-f06a44d501c7eac4931811b434213e489bc6ef28.zip | |
- Cleaned up some more party_sub_count, so that idle_no_share will also disable people in a chat or vending from counting towards the total.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8827 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/party.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/party.c b/src/map/party.c index ad7274f67..cc6939140 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -823,11 +823,12 @@ int party_send_dot_remove(struct map_session_data *sd) // party_foreachsamemap(party_sub_count, sd, 0, &c);
int party_sub_count(struct block_list *bl, va_list ap)
{
- if(((TBL_PC *)bl)->state.autotrade)
+ struct map_session_data *sd = (TBL_PC *)bl;
+
+ if (sd->state.autotrade)
return 0;
-
- if(battle_config.idle_no_share &&
- ((TBL_PC *)bl)->idletime >= (last_tick - battle_config.idle_no_share))
+
+ if (battle_config.idle_no_share && (sd->chatID || sd->vender_id || (sd->idletime < (last_tick - battle_config.idle_no_share))))
return 0;
return 1;
|