summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-09 01:54:29 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-09 01:54:29 +0000
commitc4e788ed84197cff57f51f9b0756ae8435aa9b1d (patch)
tree497c6d1d7e467a6937f1cd7f1000d98fbba0b029 /src
parentbc55a66b38a70e12bd5913206f83bf0a6734fefa (diff)
downloadhercules-c4e788ed84197cff57f51f9b0756ae8435aa9b1d.tar.gz
hercules-c4e788ed84197cff57f51f9b0756ae8435aa9b1d.tar.bz2
hercules-c4e788ed84197cff57f51f9b0756ae8435aa9b1d.tar.xz
hercules-c4e788ed84197cff57f51f9b0756ae8435aa9b1d.zip
Battlegrounds bug fix, bugreport:4996
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15035 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/map.c2
-rw-r--r--src/map/unit.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 9155a11f3..b6bb89669 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1566,6 +1566,8 @@ int map_quit(struct map_session_data *sd)
if (sd->npc_id)
npc_event_dequeue(sd);
+ if( sd->bg_id )
+ bg_team_leave(sd,1);
npc_script_event(sd, NPCE_LOGOUT);
//Unit_free handles clearing the player related data,
diff --git a/src/map/unit.c b/src/map/unit.c
index 52b479b25..44296ca51 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2139,7 +2139,6 @@ int unit_free(struct block_list *bl, clr_type clrtype)
guild_send_memberinfoshort(sd,0);
pc_cleareventtimer(sd);
pc_inventory_rental_clear(sd);
- if( sd->bg_id ) bg_team_leave(sd,1);
pc_delspiritball(sd,sd->spiritball,1);
if( sd->reg )