diff options
author | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-06 21:23:31 -0200 |
commit | d56017e3d1bf783cfdc67a702d2b70a0a27c8863 (patch) | |
tree | a47bd0ef6340ce1d011d198f430c7d96d620afe0 /src/map/party.c | |
parent | 5c94e76753c0cdb4ffb7dabbd6e135f1f7d42ef2 (diff) | |
parent | 3a3d2297068809d25ca43e19fd2977f97b2728f5 (diff) | |
download | hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.gz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.bz2 hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.tar.xz hercules-d56017e3d1bf783cfdc67a702d2b70a0a27c8863.zip |
Merge remote-tracking branch 'upstream/master'
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/pc.c
Diffstat (limited to 'src/map/party.c')
-rw-r--r-- | src/map/party.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/party.c b/src/map/party.c index ab05c23f7..6caf3db23 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -849,7 +849,7 @@ int party_send_xy_timer(int tid, int64 tick, int id, intptr_t data) { for( i = 0; i < MAX_PARTY; i++ ) { struct map_session_data* sd = p->data[i].sd; - if( !sd ) continue; + if( !sd || sd->bg_id ) continue; if( p->data[i].x != sd->bl.x || p->data[i].y != sd->bl.y ) {// perform position update @@ -1306,7 +1306,10 @@ void do_final_party(void) { db_destroy(party->booking_db); // Party Booking [Spiria] } // Constructor, init vars -void do_init_party(void) { +void do_init_party(bool minimal) { + if (minimal) + return; + party->db = idb_alloc(DB_OPT_RELEASE_DATA); party->booking_db = idb_alloc(DB_OPT_RELEASE_DATA); // Party Booking [Spiria] timer->add_func_list(party->send_xy_timer, "party_send_xy_timer"); |