mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-02 16:57:47 +00:00
Code Activity

Merge pull request #616 from collett8192/event_battle

Browse source 
Fix event battle.
This commit is contained in:
Adam 2020-01-04 01:20:56 +11:00 • committed by GitHub
commit 28d3029abe
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/Network/CommonActorControl.h
View file

@ -264,6 +264,8 @@ namespace Sapphire::Network::ActorControl
ToggleOrchestrionUnlock = 0x396,
EventBattleDialog = 0x39C,
/*!
* param1 = mountSpeed
* Retail sends 12 for mount speed star 1 unlocked and 15 for mount speed star 2 unlocked
@ -391,6 +393,8 @@ namespace Sapphire::Network::ActorControl
AchievementComp = 0x203,
AchievementCatChat = 0x206,
RequestEventBattle = 0x232C,
QuestJournalUpdateQuestVisibility = 0x2BE,
QuestJournalClosed = 0x2BF,

9
src/world/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -21,6 +21,7 @@
#include "Network/PacketWrappers/ChatPacket.h"
#include "Network/PacketWrappers/ServerNoticePacket.h"
#include "Network/PacketWrappers/ActorControlPacket.h"
#include "Network/PacketWrappers/ActorControlSelfPacket.h"
#include "Manager/DebugCommandMgr.h"
#include "Manager/EventMgr.h"
@ -493,6 +494,14 @@ void Sapphire::Network::GameConnection::clientTriggerHandler( FrameworkPtr pFw,
canTeleport, unk1, privateEstateAccess, unk );
break;
}
case ClientTriggerType::RequestEventBattle:
{
auto packet = makeActorControlSelf( player.getId(), ActorControl::EventBattleDialog, 0, param12, param2 );
player.queuePacket( packet );
player.sendDebug( "event battle level sync: {0}, ilevel sync?: {1}", param12, param2 );
break;
}
default:
{