Merge pull request #242 from P0nk/fix/cash-shop-surprise-count #patch

Fix cash shop surprise count not properly updated on usage
2024-06-15 08:35:58 +02:00 · 2024-06-15 08:31:24 +02:00 · 2024-06-14 21:44:10 +02:00 · 2024-03-02 15:38:22 +08:00
2 changed files with 5 additions and 2 deletions
--- a/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java
+++ b/src/main/java/net/server/channel/handlers/CashShopSurpriseHandler.java
@@ -40,8 +40,7 @@ public class CashShopSurpriseHandler extends AbstractPacketHandler {

            if (cssResult != null) {
                Item cssItem = cssResult.getLeft(), cssBox = cssResult.getRight();
-                c.sendPacket(PacketCreator.onCashGachaponOpenSuccess(c.getAccID(), cssBox.getSN(), cssBox.getQuantity(), cssItem, cssItem.getItemId(), cssItem.getQuantity(), true));
-                c.sendPacket(PacketCreator.showCashInventory(c));
+                c.sendPacket(PacketCreator.onCashGachaponOpenSuccess(c.getAccID(), cssBox.getCashId(), cssBox.getQuantity(), cssItem, cssItem.getItemId(), cssItem.getQuantity(), true));
            } else {
                c.sendPacket(PacketCreator.onCashItemGachaponOpenFailed());
            }
--- a/src/main/java/scripting/npc/NPCConversationManager.java
+++ b/src/main/java/scripting/npc/NPCConversationManager.java
@@ -278,6 +278,10 @@ public class NPCConversationManager extends AbstractPlayerInteraction {
        getPlayer().gainMeso(gain);
    }

+    public void gainMeso(Double gain) {
+        getPlayer().gainMeso(gain.intValue());
+    }
+
    public void gainExp(int gain) {
        getPlayer().gainExp(gain, true, true);
    }
Author	SHA1	Message	Date
Ponk	eb603e7ee9	Merge pull request #242 from P0nk/fix/cash-shop-surprise-count #patch Fix cash shop surprise count not properly updated on usage	2024-06-15 08:35:58 +02:00
P0nk	b67b29def5	Fix cash shop surprise count not properly updated on usage This reverts the hacky solution made in `db82cbcfae`	2024-06-15 08:31:24 +02:00
Ponk	d22d9b603b	Merge pull request #228 from HarkuLi/feat/fix-npc-gain-meso #patch NPC: Fix type casting error for `gainMeso()` method	2024-06-14 21:44:10 +02:00
HarkuLi	0d684c1400	NPC: Fix type casting error for `gainMeso()` method Number type values might be passed into the `gainMeso()` method in js scripts, and thus it expects a `gainMeso(Double gain)` method in the `NPCConversationManager` class.	2024-03-02 15:38:22 +08:00