Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 08:59:11 +01:00
Code Issues 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
2014-07-27 20:59:22 +02:00
parent 55eafa247d e502e01f5d
commit 2cba07d6a1
32 changed files with 264 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Scripting/ScriptMgr.h
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 */