mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 330

Browse source 
Conflicts:
	src/game/MiscHandler.cpp
This commit is contained in:
tomrus88 2009-10-10 17:28:59 +04:00
commit f46c1aaabb
45 changed files with 2216 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/MiscHandler.cpp
View file

@ -782,9 +782,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
{
BattleGround* bg = GetPlayer()->GetBattleGround();
if(bg)
if(bg->GetStatus() == STATUS_IN_PROGRESS)
bg->HandleAreaTrigger(GetPlayer(), Trigger_ID);
bg->HandleAreaTrigger(GetPlayer(), Trigger_ID);
return;
}
@ -1519,7 +1517,7 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode( WorldPacket & recv_data )
sLog.outDebug("WORLD: CMSG_MOVE_SET_CAN_FLY_ACK");
//recv_data.hexlike();
uint64 guid;
uint64 guid; // guid - unused
if(!recv_data.readPackGUID(guid))
return;