From 951c8e9c216d795366a17b5a886f8a0609522e48 Mon Sep 17 00:00:00 2001 From: wish Date: Fri, 26 Aug 2022 15:46:31 +1000 Subject: [PATCH] correct some festa functions --- server/channelserver/handlers_festa.go | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/server/channelserver/handlers_festa.go b/server/channelserver/handlers_festa.go index 6c35f770c..a1afd8b05 100644 --- a/server/channelserver/handlers_festa.go +++ b/server/channelserver/handlers_festa.go @@ -253,16 +253,7 @@ func handleMsgMhfStateFestaU(s *Session, p mhfpacket.MHFPacket) { s.server.db.QueryRow("SELECT souls FROM guild_characters WHERE character_id=$1", s.charID).Scan(&souls) bf := byteframe.NewByteFrame() bf.WriteUint32(souls) - - // This definitely isn't right, but it does stop you from claiming the festa infinitely. - var claimed uint32 - s.server.db.QueryRow("SELECT count(*) FROM festa_prizes_accepted fpa WHERE fpa.prize_id=0 AND fpa.character_id=$1", s.charID).Scan(&claimed) - if claimed > 0 { - bf.WriteUint32(0) // unk - } else { - bf.WriteUint32(0x01000000) // unk - } - + bf.WriteUint32(0) // unk doAckBufSucceed(s, pkt.AckHandle, bf.Data()) } @@ -303,8 +294,8 @@ func handleMsgMhfEnumerateFestaMember(s *Session, p mhfpacket.MHFPacket) { } bf := byteframe.NewByteFrame() bf.WriteUint16(uint16(len(members))) + bf.WriteUint16(0) // Unk for _, member := range members { - bf.WriteUint16(0) bf.WriteUint32(member.CharID) bf.WriteUint32(member.Souls) } @@ -344,7 +335,6 @@ func handleMsgMhfChargeFesta(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfAcquireFesta(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfAcquireFesta) - s.server.db.Exec("INSERT INTO public.festa_prizes_accepted VALUES (0, $1)", s.charID) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) }