summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/map.c12
2 files changed, 11 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 807cc4704..27f114051 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/11/04
+ * Readded duel code in map_quit. Why it has been removed!? [LuzZza]
* Converted itemdb tables to use smallint. Credits to ALZ. [Lance]
2006/11/01
* Reverted LK_Berserk HP requirement, as everything, including kRO X.2 and
diff --git a/src/map/map.c b/src/map/map.c
index fadb59664..2c609bc74 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1681,6 +1681,14 @@ int map_quit(struct map_session_data *sd) {
unit_remove_map(&sd->pd->bl, 0);
}
}
+
+ // Force exiting from duel and rejecting
+ // all duel invitations when player quit [LuzZza]
+ if(sd->duel_group > 0)
+ duel_leave(sd->duel_group, sd);
+
+ if(sd->duel_invite > 0)
+ duel_reject(sd->duel_invite, sd);
//Do we really need to remove the name?
idb_remove(charid_db,sd->status.char_id);
@@ -3903,8 +3911,8 @@ int do_init(int argc, char *argv[]) {
mapindex_init();
grfio_init(GRF_PATH_FILENAME);
- map_readallmaps();
-
+ map_readallmaps();
+
add_timer_func_list(map_freeblock_timer, "map_freeblock_timer");
add_timer_func_list(map_clearflooritem_timer, "map_clearflooritem_timer");
add_timer_func_list(map_removemobs_timer, "map_removemobs_timer");