summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/npchandler.cpp2
-rw-r--r--src/net/tmwa/npchandler.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 7ec80433a..9a0054b6a 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -327,10 +327,10 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg,
const BeingId npcId = msg.readBeingId("npc id");
const NpcDialogs::const_iterator diag = NpcDialog::mNpcDialogs.find(npcId);
- Ea::NpcRecv::mDialog = nullptr;
if (diag == NpcDialog::mNpcDialogs.end())
{
+ Ea::NpcRecv::mDialog = nullptr;
// Empty dialogs don't help
if (action == NpcAction::Close)
{
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index c577bc6a1..df9f40219 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -206,11 +206,10 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg,
const BeingId npcId = msg.readBeingId("npc id");
const NpcDialogs::const_iterator diag = NpcDialog::mNpcDialogs.find(npcId);
- Ea::NpcRecv::mDialog = nullptr;
if (diag == NpcDialog::mNpcDialogs.end())
{
- // +++ must be removed packet id checks from here
+ Ea::NpcRecv::mDialog = nullptr;
// Empty dialogs don't help
if (action == NpcAction::Close)
{