Skip to content

Fix cash shop lock after purchase failure #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErwinsExpertise merged 2 commits into from
Mar 31, 2026
Merged

Fix cash shop lock after purchase failure #269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2374db
Initial plan
Copilot Mar 30, 2026
0745d2b
Fix cash shop lock after purchase failure
Copilot Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions cashshop/handle_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R
commodity, ok := nx.GetCommodity(sn)
if !ok || commodity.ItemID == 0 {
// Unknown SN
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorOutOfStock))
return
}

if commodity.OnSale == 0 || commodity.Price <= 0 {
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorOutOfStock))
return
}

Expand All @@ -202,13 +202,13 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R
return
}
default:
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorUnknown))
return
}

newItem, e := channel.CreateItemFromID(commodity.ItemID, count)
if e != nil {
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorUnknown))
return
}

Expand Down Expand Up @@ -244,6 +244,7 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R
plr.SetMaplePoints(plrMaplePoints)
default:
log.Println("Unknown currency type: ", currencySel)
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorUnknown))
return
}

Expand All @@ -261,7 +262,7 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R

commodity, ok := nx.GetCommodity(pkgSN)
if !ok || commodity.Price <= 0 {
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorOutOfStock))
return
}

Expand All @@ -277,7 +278,7 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R
}
}
if !ok || len(pkgItems) == 0 {
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorOutOfStock))
return
}

Expand All @@ -294,7 +295,7 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R
return
}
default:
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorUnknown))
return
}

Expand All @@ -319,13 +320,13 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R
}

if itemID == 0 {
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorOutOfStock))
return
}

newItem, e := channel.CreateItemFromID(itemID, count)
if e != nil {
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorUnknown))
return
}
itemsToGive = append(itemsToGive, newItem)
Expand All @@ -338,7 +339,7 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R

for _, it := range itemsToGive {
if _, err := plr.GiveItem(it); err != nil {
plr.Send(packetCashShopUpdateAmounts(plrNX, plrMaplePoints))
plr.Send(packetCashShopError(opcode.SendCashShopBuyFailed, constant.CashShopErrorCheckFullInventory))
return
}
}
Expand Down Expand Up @@ -387,6 +388,7 @@ func (server *Server) handleCashShopOperation(conn mnet.Client, reader mpacket.R
plr.SetMaplePoints(plrMaplePoints)
default:
log.Println("Unknown currency type: ", currencySel)
plr.Send(packetCashShopError(opcode.SendCashShopIncSlotCountFailed, constant.CashShopErrorUnknown))
return
}

Expand Down
Loading