summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-27 17:18:07 -0200
committershennetsind <ind@henn.et>2013-10-27 17:18:07 -0200
commit830aa82793adc2a009e12d9eb9eda20e29a0c9a8 (patch)
tree95ed72c60fe7c4234319296a22aee3a018e65c52 /src/map
parenta1c3a358aefa46b37e6745f9c54cc6df14ea6ba4 (diff)
downloadhercules-830aa82793adc2a009e12d9eb9eda20e29a0c9a8.tar.gz
hercules-830aa82793adc2a009e12d9eb9eda20e29a0c9a8.tar.bz2
hercules-830aa82793adc2a009e12d9eb9eda20e29a0c9a8.tar.xz
hercules-830aa82793adc2a009e12d9eb9eda20e29a0c9a8.zip
Fixed instance empty timer
counter val could go off making the empty timer not to be run. Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 205374aad..a051506d5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9246,10 +9246,6 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) {
if( !(sd->sc.option&OPTION_INVISIBLE) ) { // increment the number of pvp players on the map
map->list[sd->bl.m].users_pvp++;
}
- if( map->list[sd->bl.m].instance_id >= 0 ) {
- instance->list[map->list[sd->bl.m].instance_id].users++;
- instance->check_idle(map->list[sd->bl.m].instance_id);
- }
sd->state.debug_remove_map = 0; // temporary state to track double remove_map's [FlavioJS]
// reset the callshop flag if the player changes map
@@ -9439,6 +9435,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) {
clif->broadcast(&sd->bl, output, strlen(output) + 1, BC_BLUE, SELF);
}
+ if( map->list[sd->bl.m].instance_id >= 0 ) {
+ instance->list[map->list[sd->bl.m].instance_id].users++;
+ instance->check_idle(map->list[sd->bl.m].instance_id);
+ }
map->iwall_get(sd); // Updates Walls Info on this Map to Client
status_calc_pc(sd, false);/* some conditions are map-dependent so we must recalculate */
sd->state.changemap = false;