yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

packet send hook can no longer return new packet

Browse Source
This commit is contained in:
Rochet2
2016-03-14 21:42:12 +02:00
parent 0023631b74
commit 4cd17fd9d9
3 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
GlobalMethods.h
View File

@@ -1880,13 +1880,8 @@ namespace LuaGlobalFunctions
switch (banMode) switch (banMode)
{ {
case BAN_ACCOUNT: case BAN_ACCOUNT:
#ifdef CATA
if (!Utf8ToUpperOnlyLatin(nameOrIP)) if (!Utf8ToUpperOnlyLatin(nameOrIP))
return 0; return 0;
#else
if (!AccountMgr::normalizeString(nameOrIP))
return 0;
#endif
break; break;
case BAN_CHARACTER: case BAN_CHARACTER:
if (!normalizePlayerName(nameOrIP)) if (!normalizePlayerName(nameOrIP))

6
LuaEngine.h
View File

@@ -402,9 +402,9 @@ public:
void OnSpawn(GameObject* gameobject); void OnSpawn(GameObject* gameobject);
/* Packet */ /* Packet */
bool OnPacketSend(WorldSession* session, WorldPacket& packet); bool OnPacketSend(WorldSession* session, const WorldPacket& packet);
void OnPacketSendAny(Player* player, WorldPacket& packet, bool& result); void OnPacketSendAny(Player* player, const WorldPacket& packet, bool& result);
void OnPacketSendOne(Player* player, WorldPacket& packet, bool& result); void OnPacketSendOne(Player* player, const WorldPacket& packet, bool& result);
bool OnPacketReceive(WorldSession* session, WorldPacket& packet); bool OnPacketReceive(WorldSession* session, WorldPacket& packet);
void OnPacketReceiveAny(Player* player, WorldPacket& packet, bool& result); void OnPacketReceiveAny(Player* player, WorldPacket& packet, bool& result);
void OnPacketReceiveOne(Player* player, WorldPacket& packet, bool& result); void OnPacketReceiveOne(Player* player, WorldPacket& packet, bool& result);

22
PacketHooks.cpp
View File

@@ -29,7 +29,7 @@ using namespace Hooks;
return;\ return;\
LOCK_ELUNA LOCK_ELUNA
bool Eluna::OnPacketSend(WorldSession* session, WorldPacket& packet) bool Eluna::OnPacketSend(WorldSession* session, const WorldPacket& packet)
{ {
bool result = true; bool result = true;
Player* player = NULL; Player* player = NULL;
@@ -39,7 +39,7 @@ bool Eluna::OnPacketSend(WorldSession* session, WorldPacket& packet)
OnPacketSendOne(player, packet, result); OnPacketSendOne(player, packet, result);
return result; return result;
} }
void Eluna::OnPacketSendAny(Player* player, WorldPacket& packet, bool& result) void Eluna::OnPacketSendAny(Player* player, const WorldPacket& packet, bool& result)
{ {
START_HOOK_SERVER(SERVER_EVENT_ON_PACKET_SEND); START_HOOK_SERVER(SERVER_EVENT_ON_PACKET_SEND);
Push(new WorldPacket(packet)); Push(new WorldPacket(packet));
@@ -48,22 +48,18 @@ void Eluna::OnPacketSendAny(Player* player, WorldPacket& packet, bool& result)
while (n > 0) while (n > 0)
{ {
int r = CallOneFunction(n--, 2, 2); int r = CallOneFunction(n--, 2, 1);
if (lua_isboolean(L, r + 0) && !lua_toboolean(L, r + 0)) if (lua_isboolean(L, r + 0) && !lua_toboolean(L, r + 0))
result = false; result = false;
if (lua_isuserdata(L, r + 1)) lua_pop(L, 1);
if (WorldPacket* data = CHECKOBJ<WorldPacket>(L, r + 1, false))
packet = *data;
lua_pop(L, 2);
} }
CleanUpStack(2); CleanUpStack(2);
} }
void Eluna::OnPacketSendOne(Player* player, WorldPacket& packet, bool& result) void Eluna::OnPacketSendOne(Player* player, const WorldPacket& packet, bool& result)
{ {
START_HOOK_PACKET(PACKET_EVENT_ON_PACKET_SEND, packet.GetOpcode()); START_HOOK_PACKET(PACKET_EVENT_ON_PACKET_SEND, packet.GetOpcode());
Push(new WorldPacket(packet)); Push(new WorldPacket(packet));
@@ -72,16 +68,12 @@ void Eluna::OnPacketSendOne(Player* player, WorldPacket& packet, bool& result)
while (n > 0) while (n > 0)
{ {
int r = CallOneFunction(n--, 2, 2); int r = CallOneFunction(n--, 2, 1);
if (lua_isboolean(L, r + 0) && !lua_toboolean(L, r + 0)) if (lua_isboolean(L, r + 0) && !lua_toboolean(L, r + 0))
result = false; result = false;
if (lua_isuserdata(L, r + 1)) lua_pop(L, 1);
if (WorldPacket* data = CHECKOBJ<WorldPacket>(L, r + 1, false))
packet = *data;
lua_pop(L, 2);
} }
CleanUpStack(2); CleanUpStack(2);