From 60aad92539fa33c2bd63e683628bd29978c17e0e Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Sat, 3 Mar 2018 17:28:42 -0500
Subject: don't blindly trust event npc name
---
src/map/npc.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 531ad28..3388ea1 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -579,7 +579,14 @@ int npc_event(dumb_ptr<map_session_data> sd, NpcEvent eventname,
{
if (!eventname.label && eventname.npc && sd)
{
- ev.nd = npc_name2id(eventname.npc)->is_script();
+ dumb_ptr<npc_data> fnd = npc_name2id(eventname.npc);
+ if (fnd == nullptr)
+ {
+ PRINTF("npc_event: NPC not found when calling event [%s]\n"_fmt,
+ eventname.npc);
+ return 0;
+ }
+ ev.nd = fnd->is_script();
ev.pos = 0; // start from the beginning of a npc
}
else
--
cgit v1.2.3-70-g09d2