Skip to content

Commit f64a824

Browse files
AkkadiusAkkadius
committed
[Player Events] Don't Write Empty Data
1 parent a0ff9d6 commit f64a824

4 files changed

Lines changed: 336 additions & 72 deletions

File tree

‎common/database.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2224,7 +2224,7 @@ void Database::PurgeCharacterParcels()
22242224
pd.char_id = r.char_id;
22252225
{
22262226
cereal::JSONOutputArchiveSingleLine ar(ss);
2227-
pd.serialize(ar);
2227+
ar(pd);
22282228
}
22292229

22302230
pel.event_data = ss.str();

‎common/events/player_event_logs.cpp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ void PlayerEventLogs::ProcessBatchQueue()
189189
try {
190190
std::stringstream ss(data);
191191
cereal::JSONInputArchive ar(ss);
192-
out.serialize(ar);
192+
ar(out);
193193
}
194194
catch (const std::exception &e) {}
195195
};
@@ -588,7 +588,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
588588
{
589589
ss << e.player_event_log.event_data;
590590
cereal::JSONInputArchive ar(ss);
591-
n.serialize(ar);
591+
ar(n);
592592
}
593593
payload = PlayerEventDiscordFormatter::FormatAAGainedEvent(e, n);
594594
break;
@@ -599,7 +599,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
599599
{
600600
ss << e.player_event_log.event_data;
601601
cereal::JSONInputArchive ar(ss);
602-
n.serialize(ar);
602+
ar(n);
603603
}
604604
payload = PlayerEventDiscordFormatter::FormatAAPurchasedEvent(e, n);
605605
break;
@@ -611,7 +611,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
611611
{
612612
ss << e.player_event_log.event_data;
613613
cereal::JSONInputArchive ar(ss);
614-
n.serialize(ar);
614+
ar(n);
615615
}
616616
payload = PlayerEventDiscordFormatter::FormatCombineEvent(e, n);
617617
break;
@@ -622,7 +622,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
622622
{
623623
ss << e.player_event_log.event_data;
624624
cereal::JSONInputArchive ar(ss);
625-
n.serialize(ar);
625+
ar(n);
626626
}
627627
payload = PlayerEventDiscordFormatter::FormatDeathEvent(e, n);
628628
break;
@@ -633,7 +633,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
633633
{
634634
ss << e.player_event_log.event_data;
635635
cereal::JSONInputArchive ar(ss);
636-
n.serialize(ar);
636+
ar(n);
637637
}
638638
payload = PlayerEventDiscordFormatter::FormatDiscoverItemEvent(e, n);
639639
break;
@@ -644,7 +644,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
644644
{
645645
ss << e.player_event_log.event_data;
646646
cereal::JSONInputArchive ar(ss);
647-
n.serialize(ar);
647+
ar(n);
648648
}
649649
payload = PlayerEventDiscordFormatter::FormatDroppedItemEvent(e, n);
650650
break;
@@ -662,7 +662,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
662662
{
663663
ss << e.player_event_log.event_data;
664664
cereal::JSONInputArchive ar(ss);
665-
n.serialize(ar);
665+
ar(n);
666666
}
667667
payload = PlayerEventDiscordFormatter::FormatFishSuccessEvent(e, n);
668668
break;
@@ -673,7 +673,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
673673
{
674674
ss << e.player_event_log.event_data;
675675
cereal::JSONInputArchive ar(ss);
676-
n.serialize(ar);
676+
ar(n);
677677
}
678678
payload = PlayerEventDiscordFormatter::FormatForageSuccessEvent(e, n);
679679
break;
@@ -684,7 +684,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
684684
{
685685
ss << e.player_event_log.event_data;
686686
cereal::JSONInputArchive ar(ss);
687-
n.serialize(ar);
687+
ar(n);
688688
}
689689
payload = PlayerEventDiscordFormatter::FormatDestroyItemEvent(e, n);
690690
break;
@@ -695,7 +695,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
695695
{
696696
ss << e.player_event_log.event_data;
697697
cereal::JSONInputArchive ar(ss);
698-
n.serialize(ar);
698+
ar(n);
699699
}
700700
payload = PlayerEventDiscordFormatter::FormatLevelGainedEvent(e, n);
701701
break;
@@ -706,7 +706,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
706706
{
707707
ss << e.player_event_log.event_data;
708708
cereal::JSONInputArchive ar(ss);
709-
n.serialize(ar);
709+
ar(n);
710710
}
711711
payload = PlayerEventDiscordFormatter::FormatLevelLostEvent(e, n);
712712
break;
@@ -717,7 +717,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
717717
{
718718
ss << e.player_event_log.event_data;
719719
cereal::JSONInputArchive ar(ss);
720-
n.serialize(ar);
720+
ar(n);
721721
}
722722
payload = PlayerEventDiscordFormatter::FormatLootItemEvent(e, n);
723723
break;
@@ -728,7 +728,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
728728
{
729729
ss << e.player_event_log.event_data;
730730
cereal::JSONInputArchive ar(ss);
731-
n.serialize(ar);
731+
ar(n);
732732
}
733733
payload = PlayerEventDiscordFormatter::FormatGroundSpawnPickupEvent(e, n);
734734
break;
@@ -739,7 +739,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
739739
{
740740
ss << e.player_event_log.event_data;
741741
cereal::JSONInputArchive ar(ss);
742-
n.serialize(ar);
742+
ar(n);
743743
}
744744
payload = PlayerEventDiscordFormatter::FormatNPCHandinEvent(e, n);
745745
break;
@@ -750,7 +750,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
750750
{
751751
ss << e.player_event_log.event_data;
752752
cereal::JSONInputArchive ar(ss);
753-
n.serialize(ar);
753+
ar(n);
754754
}
755755
payload = PlayerEventDiscordFormatter::FormatEventSay(e, n);
756756
break;
@@ -761,7 +761,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
761761
{
762762
ss << e.player_event_log.event_data;
763763
cereal::JSONInputArchive ar(ss);
764-
n.serialize(ar);
764+
ar(n);
765765
}
766766
payload = PlayerEventDiscordFormatter::FormatGMCommand(e, n);
767767
break;
@@ -772,7 +772,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
772772
{
773773
ss << e.player_event_log.event_data;
774774
cereal::JSONInputArchive ar(ss);
775-
n.serialize(ar);
775+
ar(n);
776776
}
777777
payload = PlayerEventDiscordFormatter::FormatSkillUpEvent(e, n);
778778
break;
@@ -783,7 +783,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
783783
{
784784
ss << e.player_event_log.event_data;
785785
cereal::JSONInputArchive ar(ss);
786-
n.serialize(ar);
786+
ar(n);
787787
}
788788
payload = PlayerEventDiscordFormatter::FormatSplitMoneyEvent(e, n);
789789
break;
@@ -794,7 +794,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
794794
{
795795
ss << e.player_event_log.event_data;
796796
cereal::JSONInputArchive ar(ss);
797-
n.serialize(ar);
797+
ar(n);
798798
}
799799
payload = PlayerEventDiscordFormatter::FormatTaskAcceptEvent(e, n);
800800
break;
@@ -805,7 +805,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
805805
{
806806
ss << e.player_event_log.event_data;
807807
cereal::JSONInputArchive ar(ss);
808-
n.serialize(ar);
808+
ar(n);
809809
}
810810
payload = PlayerEventDiscordFormatter::FormatTaskCompleteEvent(e, n);
811811
break;
@@ -816,7 +816,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
816816
{
817817
ss << e.player_event_log.event_data;
818818
cereal::JSONInputArchive ar(ss);
819-
n.serialize(ar);
819+
ar(n);
820820
}
821821
payload = PlayerEventDiscordFormatter::FormatTaskUpdateEvent(e, n);
822822
break;
@@ -827,7 +827,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
827827
{
828828
ss << e.player_event_log.event_data;
829829
cereal::JSONInputArchive ar(ss);
830-
n.serialize(ar);
830+
ar(n);
831831
}
832832
payload = PlayerEventDiscordFormatter::FormatTradeEvent(e, n);
833833
break;
@@ -838,7 +838,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
838838
{
839839
ss << e.player_event_log.event_data;
840840
cereal::JSONInputArchive ar(ss);
841-
n.serialize(ar);
841+
ar(n);
842842
}
843843
payload = PlayerEventDiscordFormatter::FormatTraderPurchaseEvent(e, n);
844844
break;
@@ -849,7 +849,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
849849
{
850850
ss << e.player_event_log.event_data;
851851
cereal::JSONInputArchive ar(ss);
852-
n.serialize(ar);
852+
ar(n);
853853
}
854854
payload = PlayerEventDiscordFormatter::FormatTraderSellEvent(e, n);
855855
break;
@@ -860,7 +860,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
860860
{
861861
ss << e.player_event_log.event_data;
862862
cereal::JSONInputArchive ar(ss);
863-
n.serialize(ar);
863+
ar(n);
864864
}
865865
payload = PlayerEventDiscordFormatter::FormatResurrectAcceptEvent(e, n);
866866
break;
@@ -871,7 +871,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
871871
{
872872
ss << e.player_event_log.event_data;
873873
cereal::JSONInputArchive ar(ss);
874-
n.serialize(ar);
874+
ar(n);
875875
}
876876

877877
payload = PlayerEventDiscordFormatter::FormatMerchantPurchaseEvent(e, n);
@@ -883,7 +883,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
883883
{
884884
ss << e.player_event_log.event_data;
885885
cereal::JSONInputArchive ar(ss);
886-
n.serialize(ar);
886+
ar(n);
887887
}
888888

889889
payload = PlayerEventDiscordFormatter::FormatMerchantSellEvent(e, n);
@@ -895,7 +895,7 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
895895
{
896896
ss << e.player_event_log.event_data;
897897
cereal::JSONInputArchive ar(ss);
898-
n.serialize(ar);
898+
ar(n);
899899
}
900900

901901
payload = PlayerEventDiscordFormatter::FormatZoningEvent(e, n);

‎common/events/player_event_logs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class PlayerEventLogs {
5858
std::stringstream ss;
5959
{
6060
cereal::JSONOutputArchiveSingleLine ar(ss);
61-
e.serialize(ar);
61+
ar(e);
6262
}
6363

6464
n.event_type_name = PlayerEvent::EventName[t];

0 commit comments

Comments
 (0)