From b648e49e821760502b5b5ae826b194c98b17d529 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 19 May 2020 12:25:19 +0300
Subject: fix motd on load/unload npc.
---
src/map/atcommand.c | 3 +++
src/map/clif.c | 1 +
src/map/npc.c | 4 +++-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 54cc9e2c9..76448b237 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -4499,6 +4499,7 @@ ACMD(loadnpc)
// add to list of script sources and run it
npc->addsrcfile(message);
npc->parsesrcfile(message,true);
+ npc->motd = npc->name2id("HerculesMOTD");
npc->read_event_script();
clif->message(fd, msg_fd(fd,262));
@@ -4533,6 +4534,7 @@ ACMD(unloadnpc)
npc->unload_duplicates(nd, (flag != 0));
npc->unload(nd, true, (flag != 0));
+ npc->motd = npc->name2id("HerculesMOTD");
npc->read_event_script();
clif->message(fd, msg_fd(fd, 112)); /// Npc Disabled.
return true;
@@ -4588,6 +4590,7 @@ ACMD(reloadnpc)
clif->message(fd, msg_fd(fd, 1386)); /// File unloaded. Be aware that...
npc->addsrcfile(file_path);
npc->parsesrcfile(file_path, true);
+ npc->motd = npc->name2id("HerculesMOTD");
npc->read_event_script();
clif->message(fd, msg_fd(fd, 262)); /// Script loaded.
return true;
diff --git a/src/map/clif.c b/src/map/clif.c
index 12242e44c..8edb47e61 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -15485,6 +15485,7 @@ static void clif_parse_GMKick(int fd, struct map_session_data *sd)
}
npc->unload_duplicates(nd, true);
npc->unload(nd, true, true);
+ npc->motd = npc->name2id("HerculesMOTD");
npc->read_event_script();
}
break;
diff --git a/src/map/npc.c b/src/map/npc.c
index 2f03623e4..30aeb616a 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -5728,8 +5728,10 @@ static bool npc_unloadfile(const char *filepath, bool unload_mobs)
dbi_destroy(iter);
- if (found) /// Refresh event cache.
+ if (found) { /// Refresh event cache.
+ npc->motd = npc->name2id("HerculesMOTD");
npc->read_event_script();
+ }
return found;
}
--
cgit v1.2.3-70-g09d2