diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2013-07-05 14:02:21 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2013-07-05 14:02:21 -0300 |
| commit | ea5a413cdf7eec37141a7fe124cad38d66464ac4 (patch) | |
| tree | 362b45932adb14f32fbd5b4f756f7a77371a10f2 /src/map | |
| parent | ebc0cc4695e13570bf9eb525a42eeba820ed34cb (diff) | |
| download | hercules-ea5a413cdf7eec37141a7fe124cad38d66464ac4.tar.gz hercules-ea5a413cdf7eec37141a7fe124cad38d66464ac4.tar.bz2 hercules-ea5a413cdf7eec37141a7fe124cad38d66464ac4.tar.xz hercules-ea5a413cdf7eec37141a7fe124cad38d66464ac4.zip | |
Implemented real-time server stats (in and out data and ram usage), made by Ai4rei; thanks!
Another follow up, now to fix maximum value of chatdori setting;
And fixed a bug where warping to a disable map would cause the map-server to crash.
Signed-off-by: Matheus Macabu <mkbu95@gmail.com>
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 8423467c6..2aaf89107 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -407,7 +407,7 @@ ACMD(mapmove) if (mapindex) m = iMap->mapindex2mapid(mapindex); - if (!mapindex) { // m < 0 means on different server! [Kevin] + if (!mapindex || m < 0) { // m < 0 means on different server or that map is disabled! [Kevin] clif->message(fd, msg_txt(1)); // Map not found. return false; } diff --git a/src/map/battle.c b/src/map/battle.c index d03afc431..aeed4c2b0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -6461,7 +6461,7 @@ static const struct _battle_data { { "item_enabled_npc", &battle_config.item_enabled_npc, 1, 0, 1, }, { "gm_ignore_warpable_area", &battle_config.gm_ignore_warpable_area, 0, 2, 100, }, { "packet_obfuscation", &battle_config.packet_obfuscation, 1, 0, 3, }, - { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, 1, }, + { "client_accept_chatdori", &battle_config.client_accept_chatdori, 0, 0, INT_MAX, }, }; #ifndef STATS_OPT_OUT /** |