From 9e22af7b482fb3c0dc5d9c77fbce7967e514bb29 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 22 Nov 2018 23:59:42 +0100
Subject: [PATCH] Minor changes

---
 .../sapphire_zone/Event/EventHelper.cpp       | Bin 2765 -> 3067 bytes
 .../sapphire_zone/Network/GameConnection.h    |   3 +--
 .../Network/Handlers/EventHandlers.cpp        |   5 ++---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 8243599c034b73f4f4ef7feb023633da55cc198d..11b17e0810bf73ed62fc3def6b4e91c8b22e0c66 100644
GIT binary patch
literal 3067
zcmb_e&2HN`5Z<!^zr$1ocAd7ilNRVfZ43nNpMhc*+otHDEeu8)$J)rGR-$63X@Gr@
zJ?&v%q{qHRpQJM+Ma#BYAw_K1mN_#Y=leJu@^&Jlw2ToRkJVzK<X}GPc5eH@r>l5K
zpC>|#=O{538sjaOH#$j&{AI>#!NId!EO4pvv%x&5k3T&}sb654VcuvFGESYT+v#?2
zr7@Q<Ryl^D$Ar`AZ25@o-A-8~@)RV^R%9YV=V}QVmqN#3Sm>PHERM+`3{O#;r{5{I
z2W2AlgZonr$Qe#z*z0yKyBz>gY6Y1S0uIgG1B!hNtV|egO9Z3d9!(4e@!(;Fczlr|
zMOWyf5ga@;`MDWNc_!6Tl1nY&O9<R}09VetSSC7}_bie@rAz@#t^koJ5FA1C^TH}h
zc^c*IKMo7SKT9lh$iY6`CG$61CUT}Ior-#YWJp^HEp-Dxd_5~mobi%b4{ohtOo}`X
zkfSbXNh`j0Auuq3qsJ~a1<cA)79OfUN@8+lx5_d3h@^6+3i9JZ7|aqGPiIM9=&7PS
zf@uJpSrz3nFs?;;LbcI@{d)$WB5-AWucPL;EVNo2i}b8f(#V_JbzMXKK-?|BA1b^C
zY>{~rv_E2vZbt1U<iX9U|3`+Bc6g)o%G%m>cOc&vy^gdic+I+{+-}XgsdzcKkbk1y
zj!@4rztGsoSr}_OWsg!P{VVLRp3%$f8cxsd=QSp6!eSk{t3=?96+yr6ok^muOh3VW
zGJcZe7-^L^l8=<s+{9ZO*hCgu$Oy+aphbg*wp5#GYsu@*IWE*WoiV}Z|GxbD^`HNz
z@LO;1-G~1B)q$YT`_+B=o|&fygU~iBD?6X9VMu3hfk$aNkv-Gk?oktE#M=7sMtukS
z@PT@uR%J%#tM#>mRbTVVP}|s~|Mk1wTajmt+Aqn_E<A_V)n4bv2ZzUKs4R{=7OSMH
z9?z(Dpp54#QYVUCgGVqNF6RpPboG1f`g~u{RWsj$4DEcMCn+OrQ?_|{3W0MA;I2Ib
zwVK+SOVbfMyu(`g`Mp+`6{_8}m4mI%0WLCq(c6PhpM0pbz~LbT^!7Mhfv#~~FEJms
zIki7WuI>!06o<pz)>w(K*&1V<i89@}u55<aL#V7xW&4ZW#^rAzGIJq1;wEyeUZF_M
z<Mu_+4Bo_T&|D)^JV)BaZTG5|?B;95r(oFeny+EpVmTH3cz>i${-XX!5v;T`@6%tB
I<QIB<1I)miWdHyG

delta 831
zcmZXS&2G~`6onNhaon-g4U`mGiNO?b1f-2XDmbVrDs9>>5D@_uAXUbh)NUP*YmZ4$
zs95m;VYWO8NT?fjROJEK@&H{{-Eb%VsS#dSll$}KoZ~sG9!*`i?s%3PbqRj7Li>H{
z)$OIxMQs|L*IzKlofj`?p;5c~@w}(4z9Sx6C$3L|x~=`!FukrDcMu}`j07HDp#d?B
zwZQC?0S$KX_EvAuL<mKp<85OP%As#sB$<mfK|f?&!w6XbL!*<rgoeDKKHzT(Hw%b=
zD%_qy2;*?zFw5345u!TpeS&LH9rEMCq6`OdoRrq8<0HmSPsi8xA`-F<uSao>9~Wno
zw)m|z5&tad{F`(S=qJ)#ynO(m27g*qQ<zzNHk*f8QOIb&W4gN;@fHA1i}ML;t8_n)
z`dLy^)bG;fbPh#*;(^lyvs~8rp>mmjC{N_qzn4+E{;S;KH{?0KDbL~r6A%_b+}dNp
zY{;DmS0aPh#aB6VaU{RywaOj-va-s*RCNBMqF?!!AwEj7j6??ND>Lwo@yw8KC{GrW
zagpc%TCwb;h;gb!Y<0|iM{9zcM$U=)+@=}t;Y90__?Y4mzz}*#4sCQ5;)Eo$mg9<@
z)Y5poOL}JHvQ*chGBufs2G{5S@jqxiy*N8+YZ<o0AGmN`+??b@ZdSg#MBnZZi@_z#
Jyeu?<_ZR*D?d1Rf

diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h
index 529bba6b..c6ab31ae 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.h
+++ b/src/servers/sapphire_zone/Network/GameConnection.h
@@ -152,8 +152,7 @@ namespace Core::Network
     DECLARE_HANDLER( cfRegisterRoulette );
 
     DECLARE_HANDLER( cfDutyAccepted );
-
-
+    
     DECLARE_HANDLER( actionHandler );
 
     DECLARE_HANDLER( gm1Handler );
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index 985d8ea1..d6d77bb2 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -265,16 +265,15 @@ void Core::Network::GameConnection::eventHandlerShop( const Packets::FFXIVARR_PA
 
   auto eventType = static_cast< uint16_t >( eventId >> 16 );
 
-  std::string eventName = "onShop";
+  std::string eventName = "onOpen";
   std::string objName = Event::getEventName( eventId );
 
   player.sendDebug( "EventId: " +
                     std::to_string( eventId ) +
                     " (0x" + Util::intToHexString( static_cast< uint64_t >( eventId & 0xFFFFFFF ), 8 ) + ")" );
 
-
   player.sendDebug( "Calling: " + objName + "." + eventName );
-  player.eventStart( 0, eventId, Event::EventHandler::UI, 0, 0 );
+  player.eventStart( 0, eventId, Event::EventHandler::UI, 0, packet.data().param );
 }