Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
This commit is contained in:
Shauren committed 2014-07-27 20:59:22 +02:00
2 parents 55eafa247d e502e01f5d
commit 2cba07d6a1
32 files changed
+264 -138
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Scripting/ScriptMgr.h
+3 -3
View File
@@ -909,9 +909,9 @@ class ScriptMgr
void OnNetworkStop();
void OnSocketOpen(std::shared_ptr<WorldSocket> socket);
void OnSocketClose(std::shared_ptr<WorldSocket> socket, bool wasNew);
void OnPacketReceive(std::shared_ptr<WorldSocket> socket, WorldPacket packet);
void OnPacketSend(std::shared_ptr<WorldSocket> socket, WorldPacket packet);
void OnUnknownPacketReceive(std::shared_ptr<WorldSocket> socket, WorldPacket packet);
void OnPacketReceive(std::shared_ptr<WorldSocket> socket, WorldPacket const& packet);
void OnPacketSend(std::shared_ptr<WorldSocket> socket, WorldPacket const& packet);
void OnUnknownPacketReceive(std::shared_ptr<WorldSocket> socket, WorldPacket const& packet);
public: /* WorldScript */