From ca1aa0f4025096b2f7778f6e95c2a1e2bd0d54a2 Mon Sep 17 00:00:00 2001
From: 5jiji <github@5jiji.com>
Date: Sun, 10 Mar 2024 13:32:34 +0100
Subject: [PATCH] Fix Bugs

- Players who didn't get in the tile would get their tickets refunded.
---
 Assets/Scripts/BidHandler.cs              |  15 +++++++++------
 Assets/Scripts/Networking/TwitchClient.cs |   4 ++--
 Assets/StreamingAssets/PlayerProfiles.db  | Bin 12288 -> 12288 bytes
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Assets/Scripts/BidHandler.cs b/Assets/Scripts/BidHandler.cs
index a5d0078e..500b41d9 100644
--- a/Assets/Scripts/BidHandler.cs
+++ b/Assets/Scripts/BidHandler.cs
@@ -371,7 +371,7 @@ public void ReleasePlayersIntoTile(GameTile gt, Vector3 beltWayPointPos)
         UpdateBiddingQ();
     }
 
-    public void ClearFromQ(PlayerHandler ph, bool updateQ)
+    public void ClearFromQ(PlayerHandler ph, bool updateQ, bool unbid = false)
     {
         ph.ResetBid();
 
@@ -385,7 +385,7 @@ public void ClearFromQ(PlayerHandler ph, bool updateQ)
         if (ph.pb != null)
             ph.pb.ExplodeBall();
 
-        CancelTicketsUsed(ph);
+        CancelTicketsUsed(ph, unbid);
 
         if (updateQ)
             UpdateBiddingQ();
@@ -593,12 +593,15 @@ private void SetBasePrizeByRarity(RarityType rarity)
         UpdateBiddingQ(); 
     }
 
-    private async void CancelTicketsUsed(PlayerHandler ph)
+    private async void CancelTicketsUsed(PlayerHandler ph, bool unbid)
     {
-        foreach (var rewardID in ph.redemptionsIds.Keys)
+        if (unbid)
         {
-            List<string> redemptionsIds = ph.redemptionsIds[rewardID];
-            await TwitchApi.RejectRewardRedemption(rewardID, redemptionsIds);
+            foreach (var rewardID in ph.redemptionsIds.Keys)
+            {
+                List<string> redemptionsIds = ph.redemptionsIds[rewardID];
+                await TwitchApi.RejectRewardRedemption(rewardID, redemptionsIds);
+            }
         }
 
         ph.redemptionsIds.Clear();
diff --git a/Assets/Scripts/Networking/TwitchClient.cs b/Assets/Scripts/Networking/TwitchClient.cs
index 01f163f4..890f9588 100644
--- a/Assets/Scripts/Networking/TwitchClient.cs
+++ b/Assets/Scripts/Networking/TwitchClient.cs
@@ -362,7 +362,7 @@ private void ProcessGlobalCommands(string messageId, PlayerHandler ph, string ms
 
         else if (commandKey.StartsWith("!cancelbid") || commandKey.StartsWith("!unbid"))
         {
-            _bidHandler.ClearFromQ(ph, updateQ:true); 
+            _bidHandler.ClearFromQ(ph, updateQ:true, unbid:true);
         }
 
         else if (commandKey.StartsWith("!song"))
@@ -687,4 +687,4 @@ private string RemoveTwitchEmotes(string rawMsg, List<Emote> emotes)
 
         return noEmotesSb.ToString();
     }
-}
\ No newline at end of file
+}
diff --git a/Assets/StreamingAssets/PlayerProfiles.db b/Assets/StreamingAssets/PlayerProfiles.db
index e038ff61943a5fff773272980b4319a5f946fd4f..32ed52c826a0e9f50f7aa0de7e2e55f22458cb26 100644
GIT binary patch
literal 12288
zcmeI0QEVJX8OL|e_WADYyNOe~NoyzB+@wj)RMF1N?(A+UklnpKH<f9MeH2OsVeMPT
ztDNuLy>l7^c_EQn+6wv*QCEP35Gqoj5^Z@2JU~&T7O5bRcnDxsDx|6i2~w*HDiu+7
z=j_&#Ox2gZAni(b<8QwC&o}e?zL~r8>}RIKZlEl*qb0wq5NVqv%hF**ktB)4ufF)T
z`N;7f{hLPICiaItL^|}jyNlp$DN}qvDn0;y@nM40pAtw3qy$m|DS?zgN+2bW5=aT8
z1pW^Roc*FaxT8{$A6e=8bIsu1roS3Q_eSl7uo-lCE91_1cHL9zwlnQ1W!_m<4i?Jw
zhr;gs;*n}uIq669i+-dmN8yqmttuyiRi)MLDy@}fQ@MR}<YzlU)bf{t_s7SsBdwG1
zkG+Pox^<rS`a5^e9=(Sj-<e&R>&!>tTo9F&u+<HY2T>B^o_J=r-E2p91*bTL8?_&5
z-7rr*^26p-<Tt{g)xE(xyBq}bi_Xei45=12o7c~|)n7l=z25DvL{U8LeeG~QxNcwd
z#i-p1Tz|Q{5(OP@2la3%INItB;2rI*->ir8CxUJ#j@;^U-i=^R*x<US!-XK3ady5P
z#mKjinrb)sp|gSCX}4}1I2&|2p~x}qce+Pn^pQW`jR%yKx$t-#K&gB@lihK&B1>Vb
z5uEBg*o;$q%wOrYnSG3}p<{@*li&5Z<V+Rg*JSoW2D}8m3F=^?bh&iC6qU@9RD3Ca
zf3aSi82;<<`QhbZZRkHk7l$4nst-*RE*E}M=oaoQ^ygpBpDR9*-<$h;?%CXG&d%ir
z|1kK}pg&m2zLC9<%%46ffs{Z>ASI9z_(%!R$+3}-#UEnhY}Q;(&LvNl;F+LN4gIBd
zt1;ub1VhzRiCV+Cb$hV-OZPCX2z8pu=`<Cp7&#a-oi}5x(St%A);Jy3Aa<)pjr8K}
z{MQ;iAk=A;(`gi98ylpjoBHWD9J*hqBZ$)x1nrt_P`elJnJ3TD+r&DH*ICf4A+Kik
z_V=mrLv)`|hY6>{1X70>hT4ml`OV7|3U!3%NmS@Lx?_1g-P*n%(y~}*a`A`>byK%>
ztGCYEM<?lCp-$5|ou)$-sjj-g^Wlq+Qbnl4JQr+1Lw7yP?XC07D~oiGP)7_d9x))P
z=|u14!P}Leu!eYDCMnNM7V-6hH0anKwrkS2<wHq{x}W%GKi$PkH%pr@8A2g)k&ZS}
zICNn*oe=6YK7|^A@iK9BL-*vj7U;N8hxt@s6IN|YcQ??qA30BN73v6|3c^xhqm7dJ
z_pa~KTZB4|kEfZ?ux(nUEEQANesm|@Dbx`jDbb+mI@Qf}zW(X|(j7vb#$Od0hFC`y
z(t4$K=J>DZ%|adGO9oj`b95c`O56SMeV6E%P>1>aVG30jVYL^pT6^KwbX2HAJQoym
zQL$lE**e{GUtOR#33VEORcI*YLJhNbBs~95GjzLH$CtJim$pT0(ktz$7k_{Dj*+oF
z2ew?jNoB`ZuVt#1p~g>h<wUU9ZY~8KVyduKOZsx_WZ?4e_TF!96U2;<1z$5rkB<{k
zv4^EMbL;BqYyDTgM!^`UY>CQFMJCHH)_{gbow&XS4kx;+`R##O5=Z2P$bcp>s)pL=
z`w}~cryo~oQ5ca=V|;PD#3LB@ok=48<JC)3=CC*-FGLhtj%8a;LvFH&i|@WANp!bB
zo6Bl^jcXbtNF!(?Cl8K&ofd>^<&QprRaJG(8kWAp*1Ft$h317iJ{|E1HdHIVOr_VD
z?qc{eGbdPQoJaoJNAbs~V^opdklkdD&TAug&_Q8D{xD)_88yc=vGha|@yb=>pqUj%
z<hO_jbSSM^UPE4ERQEskCLIt)ybdWORcsN2`+vap`1I)aXunX$AAbuvt{dMQSpIyX
zyLuNoZ}y2-%AZGspypvr%!d3I#^#+%Yi35Q<l!I;J!Cso(vZK*_PG7oN2x4aD}QyE
z(6kJPBAodOTWjUvi-q{>(`0E~0>1^<z+2$Y;OF2e@H}`LoCJ&Dk04vR0@}a>W$*$h
zmfkL{gD-$-V1No3Exij~E&UCg20r*CP{DZV4R99Bf)~Lv;QQbm@H%+xBmKUYPL>i#
z38Vy40x5x%KuRDbkP=7<qy$m|DS;0lknJ0h37$+EO|2vi)($d@9$-GSpEcHP%t!Vy
zONFd4%Sof@dzsHtSf{avb!xkrMRzfaOe769$62R-E9*3GVV1U&S$Id%AnWF&!E}sS
z<|y-_n^<FPFZS(`-}@ih2pghr8|VYF0hnQw5`z|*L5EqR4JCb~ki6@8)}`hW0}nET
XWD`RhNZze})`j|5gEReoAaDK;qVgKv

delta 298
zcmZojXh@hK%_uxk##vC9LC^UxFaHk)Cf;ZU-e~^an-djY^K6dhUCE>-$Ya95e}cb{
zKZIX~?+M>3z9K#gJ_g<synVbOyfQqGcvkTg@R)2Y<l>oZB6D5P)YZh)($I)Gj^mC&
z?OX3)hRHIriNXdhMy7_2MvOUNQS}dtEVw66kQY-j2}(_I$xO`6&r1n%bv86nHUt7A
z=M+XgjyuMz7d}k1n|wlcrl6s-v5Tp>5u-Cm`<s;WiIa=u5(QnHoQw=jjTmQuMUO;Y
zo%}>@rl5tZk(rs95#w#JXzN>z$$j#gf)<u8mKK&qj0s@TWz$k7pOCka66Eh@;6Ka%
lmj4U?E&g5nGx<03FXO+$e~|y-<^Y8rzKIPFCwJ?Y0sxP@Vr2jT