Skip to content

Commit 31a7e77

Browse files
committed
Fix gossip issue when Eluna is disabled in config
References ElunaLuaEngine/Eluna#523
1 parent 84394ed commit 31a7e77

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/server/game/Handlers/NPCHandler.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,13 @@ void WorldSession::HandleGossipHelloOpcode(WorldPacket& recvData)
186186

187187
_player->PlayerTalkClass->ClearMenus();
188188
#ifdef ELUNA
189+
// Let Eluna handle gossip first; fallback to default if unhandled
190+
bool handled = false;
191+
189192
if (Eluna* e = GetPlayer()->GetEluna())
190-
if (!e->OnGossipHello(_player, unit))
193+
handled = e->OnGossipHello(_player, unit);
194+
195+
if(!handled)
191196
#endif
192197
if (!unit->AI()->OnGossipHello(_player))
193198
{

0 commit comments

Comments
 (0)