From bba7afa24e952b2c2ec14a42ba9c1cdc2a139ea5 Mon Sep 17 00:00:00 2001
From: ImmuState <kyoko12@gmx.at>
Date: Tue, 14 Jun 2022 12:01:26 -0700
Subject: [PATCH] Don't show internal server error on gacha with full
 inventory.

---
 .../java/emu/grasscutter/game/gacha/GachaManager.java |  3 ++-
 .../server/packet/send/PacketDoGachaRsp.java          | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
index 4ebce55e8..1e15eba12 100644
--- a/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+++ b/src/main/java/emu/grasscutter/game/gacha/GachaManager.java
@@ -31,6 +31,7 @@ import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
 import emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem;
 import emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp;
 import emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.server.game.GameServer;
 import emu.grasscutter.server.game.GameServerTickEvent;
 import emu.grasscutter.server.packet.send.PacketDoGachaRsp;
@@ -244,7 +245,7 @@ public class GachaManager {
 		} 
 		Inventory inventory = player.getInventory();
 		if (inventory.getInventoryTab(ItemType.ITEM_WEAPON).getSize() + times > inventory.getInventoryTab(ItemType.ITEM_WEAPON).getMaxCapacity()) {
-			player.sendPacket(new PacketDoGachaRsp());
+			player.sendPacket(new PacketDoGachaRsp(Retcode.RET_ITEM_EXCEED_LIMIT));
 			return;
 		}
 		
diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
index 6d8b9ddd9..db63a7169 100644
--- a/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
+++ b/src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
@@ -8,6 +8,7 @@ import emu.grasscutter.net.packet.BasePacket;
 import emu.grasscutter.net.packet.PacketOpcodes;
 import emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp;
 import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
+import emu.grasscutter.net.proto.RetcodeOuterClass.Retcode;
 import emu.grasscutter.net.proto.RetcodeOuterClass;
 
 public class PacketDoGachaRsp extends BasePacket {
@@ -42,4 +43,14 @@ public class PacketDoGachaRsp extends BasePacket {
 		
 		this.setData(p);
 	}
+
+	public PacketDoGachaRsp(Retcode retcode) {
+		super(PacketOpcodes.DoGachaRsp);
+
+		DoGachaRsp p = DoGachaRsp.newBuilder()
+				.setRetcode(retcode.getNumber())
+				.build();
+
+		this.setData(p);
+	}
 }