Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Grasscutter
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ziqian zhang
Grasscutter
Commits
ebab89d4
Commit
ebab89d4
authored
3 years ago
by
ImmuState
Committed by
Melledy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't show internal server error on gacha with full inventory.
parent
e0d38610
Branches
Branches containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+2
-1
2 additions, 1 deletion
src/main/java/emu/grasscutter/game/gacha/GachaManager.java
src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
+11
-0
11 additions, 0 deletions
.../emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
with
13 additions
and
1 deletion
src/main/java/emu/grasscutter/game/gacha/GachaManager.java
+
2
−
1
View file @
ebab89d4
...
@@ -31,6 +31,7 @@ import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
...
@@ -31,6 +31,7 @@ import emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem;
import
emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem
;
import
emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem
;
import
emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp
;
import
emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp
;
import
emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam
;
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.GameServer
;
import
emu.grasscutter.server.game.GameServerTickEvent
;
import
emu.grasscutter.server.game.GameServerTickEvent
;
import
emu.grasscutter.server.packet.send.PacketDoGachaRsp
;
import
emu.grasscutter.server.packet.send.PacketDoGachaRsp
;
...
@@ -244,7 +245,7 @@ public class GachaManager {
...
@@ -244,7 +245,7 @@ public class GachaManager {
}
}
Inventory
inventory
=
player
.
getInventory
();
Inventory
inventory
=
player
.
getInventory
();
if
(
inventory
.
getInventoryTab
(
ItemType
.
ITEM_WEAPON
).
getSize
()
+
times
>
inventory
.
getInventoryTab
(
ItemType
.
ITEM_WEAPON
).
getMaxCapacity
())
{
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
;
return
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/server/packet/send/PacketDoGachaRsp.java
+
11
−
0
View file @
ebab89d4
...
@@ -8,6 +8,7 @@ import emu.grasscutter.net.packet.BasePacket;
...
@@ -8,6 +8,7 @@ import emu.grasscutter.net.packet.BasePacket;
import
emu.grasscutter.net.packet.PacketOpcodes
;
import
emu.grasscutter.net.packet.PacketOpcodes
;
import
emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp
;
import
emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp
;
import
emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem
;
import
emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem
;
import
emu.grasscutter.net.proto.RetcodeOuterClass.Retcode
;
import
emu.grasscutter.net.proto.RetcodeOuterClass
;
import
emu.grasscutter.net.proto.RetcodeOuterClass
;
public
class
PacketDoGachaRsp
extends
BasePacket
{
public
class
PacketDoGachaRsp
extends
BasePacket
{
...
@@ -42,4 +43,14 @@ public class PacketDoGachaRsp extends BasePacket {
...
@@ -42,4 +43,14 @@ public class PacketDoGachaRsp extends BasePacket {
this
.
setData
(
p
);
this
.
setData
(
p
);
}
}
public
PacketDoGachaRsp
(
Retcode
retcode
)
{
super
(
PacketOpcodes
.
DoGachaRsp
);
DoGachaRsp
p
=
DoGachaRsp
.
newBuilder
()
.
setRetcode
(
retcode
.
getNumber
())
.
build
();
this
.
setData
(
p
);
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment