araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 22:49:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: updated SMSG_INSTANCE_SAVE_CREATED

Browse Source
This commit is contained in:
MitchesD
2015-07-27 19:44:08 +02:00
parent 982b59d2ec
commit 7951a47c03
5 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -18565,9 +18565,9 @@ void Player::BindToInstance()
if (!mapSave) //it seems sometimes mapSave is NULL, but I did not check why
return;
WorldPacket data(SMSG_INSTANCE_SAVE_CREATED, 4);
data << uint32(0);
GetSession()->SendPacket(&data);
WorldPackets::Instance::InstanceSaveCreated data;
data.Gm = IsGameMaster();
GetSession()->SendPacket(data.Write());
BindToInstance(mapSave, true);
GetSession()->SendCalendarRaidLockout(mapSave, true);
src/server/game/Maps/Map.cpp
+4 -3
View File
@@ -26,6 +26,7 @@
#include "GridNotifiersImpl.h"
#include "GridStates.h"
#include "Group.h"
#include "InstancePackets.h"
#include "InstanceScript.h"
#include "MapInstanced.h"
#include "MiscPackets.h"
@@ -3220,9 +3221,9 @@ void InstanceMap::PermBindAllPlayers(Player* source)
if (!bind || !bind->perm)
{
player->BindToInstance(save, true);
WorldPacket data(SMSG_INSTANCE_SAVE_CREATED, 4);
data << uint32(0);
player->GetSession()->SendPacket(&data);
WorldPackets::Instance::InstanceSaveCreated data;
data.Gm = player->IsGameMaster();
player->GetSession()->SendPacket(data.Write());
player->GetSession()->SendCalendarRaidLockout(save, true);
}
src/server/game/Server/Packets/InstancePackets.cpp
+8
View File
@@ -72,3 +72,11 @@ WorldPacket const* WorldPackets::Instance::InstanceResetFailed::Write()
return &_worldPacket;
}
WorldPacket const* WorldPackets::Instance::InstanceSaveCreated::Write()
{
_worldPacket.WriteBit(Gm);
_worldPacket.FlushBits();
return &_worldPacket;
}
src/server/game/Server/Packets/InstancePackets.h
+10
View File
@@ -105,6 +105,16 @@ namespace WorldPackets
WorldPacket const* Write() override { return &_worldPacket; }
};
class InstanceSaveCreated final : public ServerPacket
{
public:
InstanceSaveCreated() : ServerPacket(SMSG_INSTANCE_SAVE_CREATED, 1) { }
WorldPacket const* Write() override;
bool Gm = false;
};
}
}
src/server/game/Server/Protocol/Opcodes.cpp
+1 -1
View File
@@ -1247,7 +1247,7 @@ void OpcodeTable::Initialize()
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_INFO, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_RESET, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_RESET_FAILED, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_SAVE_CREATED, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INSTANCE_SAVE_CREATED, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVALIDATE_PLAYER, STATUS_NEVER, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVALID_PROMOTION_CODE, STATUS_UNHANDLED, CONNECTION_TYPE_REALM);
DEFINE_SERVER_OPCODE_HANDLER(SMSG_INVENTORY_CHANGE_FAILURE, STATUS_NEVER, CONNECTION_TYPE_REALM);