2 files changed, 0 insertions, 60 deletions
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index bd131d55..f19bf134 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -168,10 +168,6 @@ void NpcHandler::talk(int npcId)
     MessageOut msg(PGMSG_NPC_TALK);
     msg.writeInt16(npcId);
     gameServerConnection->send(msg);
-
-    Event event(Event::TalkSent);
-    event.setInt("npcId", npcId);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::nextDialog(int npcId)
@@ -179,10 +175,6 @@ void NpcHandler::nextDialog(int npcId)
     MessageOut msg(PGMSG_NPC_TALK_NEXT);
     msg.writeInt16(npcId);
     gameServerConnection->send(msg);
-
-    Event event(Event::NextSent);
-    event.setInt("npcId", npcId);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::closeDialog(int npcId)
@@ -190,10 +182,6 @@ void NpcHandler::closeDialog(int npcId)
     MessageOut msg(PGMSG_NPC_TALK_NEXT);
     msg.writeInt16(npcId);
     gameServerConnection->send(msg);
-
-    Event event(Event::CloseSent);
-    event.setInt("npcId", npcId);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::menuSelect(int npcId, int choice)
@@ -202,11 +190,6 @@ void NpcHandler::menuSelect(int npcId, int choice)
     msg.writeInt16(npcId);
     msg.writeInt8(choice);
     gameServerConnection->send(msg);
-
-    Event event(Event::MenuSent);
-    event.setInt("npcId", npcId);
-    event.setInt("choice", choice);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::integerInput(int npcId, int value)
@@ -215,11 +198,6 @@ void NpcHandler::integerInput(int npcId, int value)
     msg.writeInt16(npcId);
     msg.writeInt32(value);
     gameServerConnection->send(msg);
-
-    Event event(Event::IntegerInputSent);
-    event.setInt("npcId", npcId);
-    event.setInt("value", value);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::stringInput(int npcId, const std::string &value)
@@ -228,11 +206,6 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
     msg.writeInt16(npcId);
     msg.writeString(value);
     gameServerConnection->send(msg);
-
-    Event event(Event::StringInputSent);
-    event.setInt("npcId", npcId);
-    event.setString("value", value);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::sendLetter(int npcId, const std::string &recipient,
@@ -242,12 +215,6 @@ void NpcHandler::sendLetter(int npcId, const std::string &recipient,
     msg.writeString(recipient);
     msg.writeString(text);
     gameServerConnection->send(msg);
-
-    Event event(Event::SendLetterSent);
-    event.setInt("npcId", npcId);
-    event.setString("recipient", recipient);
-    event.setString("text", text);
-    event.trigger(Event::NpcChannel);
 }
 
 } // namespace ManaServ
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index aeb8cf95..54a3abe0 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -213,30 +213,18 @@ void NpcHandler::talk(int npcId)
     MessageOut outMsg(CMSG_NPC_TALK);
     outMsg.writeInt32(npcId);
     outMsg.writeInt8(0); // Unused
-
-    Event event(Event::TalkSent);
-    event.setInt("npcId", npcId);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::nextDialog(int npcId)
 {
     MessageOut outMsg(CMSG_NPC_NEXT_REQUEST);
     outMsg.writeInt32(npcId);
-
-    Event event(Event::NextSent);
-    event.setInt("npcId", npcId);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::closeDialog(int npcId)
 {
     MessageOut outMsg(CMSG_NPC_CLOSE);
     outMsg.writeInt32(npcId);
-
-    Event event(Event::CloseSent);
-    event.setInt("npcId", npcId);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::menuSelect(int npcId, int choice)
@@ -244,11 +232,6 @@ void NpcHandler::menuSelect(int npcId, int choice)
     MessageOut outMsg(CMSG_NPC_LIST_CHOICE);
     outMsg.writeInt32(npcId);
     outMsg.writeInt8(choice);
-
-    Event event(Event::MenuSent);
-    event.setInt("npcId", npcId);
-    event.setInt("choice", choice);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::integerInput(int npcId, int value)
@@ -256,11 +239,6 @@ void NpcHandler::integerInput(int npcId, int value)
     MessageOut outMsg(CMSG_NPC_INT_RESPONSE);
     outMsg.writeInt32(npcId);
     outMsg.writeInt32(value);
-
-    Event event(Event::IntegerInputSent);
-    event.setInt("npcId", npcId);
-    event.setInt("value", value);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::stringInput(int npcId, const std::string &value)
@@ -270,11 +248,6 @@ void NpcHandler::stringInput(int npcId, const std::string &value)
     outMsg.writeInt32(npcId);
     outMsg.writeString(value, value.length());
     outMsg.writeInt8(0); // Prevent problems with string reading
-
-    Event event(Event::StringInputSent);
-    event.setInt("npcId", npcId);
-    event.setString("value", value);
-    event.trigger(Event::NpcChannel);
 }
 
 void NpcHandler::sendLetter(int npcId, const std::string &recipient,