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
a548fe6c
There was an error fetching the commit references. Please try again later.
Commit
a548fe6c
authored
3 years ago
by
Benjamin Elsdon
Browse files
Options
Downloads
Patches
Plain Diff
THE MAILBOX ACTUALLY WORKS CORRECTLY NOW
parent
29a3e64d
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/game/Mail.java
+1
-1
1 addition, 1 deletion
src/main/java/emu/grasscutter/game/Mail.java
src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
+57
-34
57 additions, 34 deletions
...u/grasscutter/server/packet/send/PacketGetAllMailRsp.java
with
58 additions
and
35 deletions
src/main/java/emu/grasscutter/game/Mail.java
+
1
−
1
View file @
a548fe6c
...
@@ -47,7 +47,7 @@ public class Mail {
...
@@ -47,7 +47,7 @@ public class Mail {
this
.
_id
=
_id
;
this
.
_id
=
_id
;
this
.
mailContent
=
mailContent
;
this
.
mailContent
=
mailContent
;
this
.
itemList
=
itemList
;
this
.
itemList
=
itemList
;
this
.
sendTime
=
(
int
)
Instant
.
now
().
EPOCH
.
getEpochSecond
();
this
.
sendTime
=
(
int
)
Instant
.
now
().
getEpochSecond
();
this
.
expireTime
=
expireTime
;
this
.
expireTime
=
expireTime
;
this
.
importance
=
importance
;
this
.
importance
=
importance
;
this
.
isRead
=
false
;
this
.
isRead
=
false
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/server/packet/send/PacketGetAllMailRsp.java
+
57
−
34
View file @
a548fe6c
...
@@ -11,7 +11,9 @@ import emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp;
...
@@ -11,7 +11,9 @@ import emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp;
import
emu.grasscutter.net.proto.MailDataOuterClass.MailData
;
import
emu.grasscutter.net.proto.MailDataOuterClass.MailData
;
import
emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent
;
import
emu.grasscutter.net.proto.MailTextContentOuterClass.MailTextContent
;
import
javax.swing.*
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Base64
;
import
java.util.List
;
import
java.util.List
;
public
class
PacketGetAllMailRsp
extends
GenshinPacket
{
public
class
PacketGetAllMailRsp
extends
GenshinPacket
{
...
@@ -20,18 +22,30 @@ public class PacketGetAllMailRsp extends GenshinPacket {
...
@@ -20,18 +22,30 @@ public class PacketGetAllMailRsp extends GenshinPacket {
super
(
PacketOpcodes
.
GetAllMailRsp
);
super
(
PacketOpcodes
.
GetAllMailRsp
);
Grasscutter
.
getLogger
().
info
(
String
.
valueOf
(
isGiftMail
));
Grasscutter
.
getLogger
().
info
(
String
.
valueOf
(
isGiftMail
));
GetAllMailRsp
.
Builder
proto
=
GetAllMailRsp
.
newBuilder
();
if
(
isGiftMail
)
{
// TODO: Gift Mail
// Make sure to send the stupid empty packet
Base64
.
Decoder
decoder
=
Base64
.
getDecoder
();
byte
[]
rsp
=
decoder
.
decode
(
"IAE="
);
try
{
GetAllMailRsp
var
=
GetAllMailRsp
.
parseFrom
(
rsp
);
this
.
setData
(
var
.
toBuilder
().
build
());
}
catch
(
Exception
e
)
{
}
}
else
{
if
(
player
.
getMail
().
size
()
!=
0
)
{
// Make sure the player has mail
GetAllMailRsp
.
Builder
proto
=
GetAllMailRsp
.
newBuilder
();
List
<
MailData
>
mailDataList
=
new
ArrayList
<
MailData
>();
List
<
MailData
>
mailDataList
=
new
ArrayList
<
MailData
>();
// Dummy data.
for
(
Mail
message
:
player
.
getMail
())
{
for
(
Mail
message
:
player
.
getMail
())
{
if
(
message
.
stateValue
==
1
)
{
//Make sure it isn't a gift
MailTextContent
.
Builder
mailTextContent
=
MailTextContent
.
newBuilder
();
MailTextContent
.
Builder
mailTextContent
=
MailTextContent
.
newBuilder
();
mailTextContent
.
setTitle
(
message
.
mailContent
.
title
);
mailTextContent
.
setTitle
(
message
.
mailContent
.
title
);
mailTextContent
.
setContent
(
message
.
mailContent
.
content
);
mailTextContent
.
setContent
(
message
.
mailContent
.
content
);
mailTextContent
.
setSender
(
message
.
mailContent
.
sender
);
mailTextContent
.
setSender
(
message
.
mailContent
.
sender
);
List
<
MailItemOuterClass
.
MailItem
>
mailItems
=
new
ArrayList
<
MailItemOuterClass
.
MailItem
>();
List
<
MailItemOuterClass
.
MailItem
>
mailItems
=
new
ArrayList
<>();
for
(
Mail
.
MailItem
item
:
message
.
itemList
)
{
for
(
Mail
.
MailItem
item
:
message
.
itemList
)
{
MailItemOuterClass
.
MailItem
.
Builder
mailItem
=
MailItemOuterClass
.
MailItem
.
newBuilder
();
MailItemOuterClass
.
MailItem
.
Builder
mailItem
=
MailItemOuterClass
.
MailItem
.
newBuilder
();
...
@@ -52,16 +66,25 @@ public class PacketGetAllMailRsp extends GenshinPacket {
...
@@ -52,16 +66,25 @@ public class PacketGetAllMailRsp extends GenshinPacket {
mailData
.
setImportance
(
message
.
importance
);
mailData
.
setImportance
(
message
.
importance
);
mailData
.
setIsRead
(
message
.
isRead
);
mailData
.
setIsRead
(
message
.
isRead
);
mailData
.
setIsAttachmentGot
(
message
.
isAttachmentGot
);
mailData
.
setIsAttachmentGot
(
message
.
isAttachmentGot
);
mailData
.
setStateValue
(
message
.
stateValue
);
mailData
.
setStateValue
(
1
);
mailDataList
.
add
(
mailData
.
build
());
mailDataList
.
add
(
mailData
.
build
());
}
}
}
proto
.
addAllMailList
(
mailDataList
);
proto
.
addAllMailList
(
mailDataList
);
//proto.setIsTruncated(true);
proto
.
setIsTruncated
(
true
);
Grasscutter
.
getLogger
().
info
(
Grasscutter
.
getDispatchServer
().
getGsonFactory
().
toJson
(
proto
.
build
()));
this
.
setData
(
proto
.
build
());
this
.
setData
(
proto
.
build
());
}
else
{
// Make sure to send the stupid empty packet
Base64
.
Decoder
decoder
=
Base64
.
getDecoder
();
byte
[]
rsp
=
decoder
.
decode
(
"IAE="
);
try
{
GetAllMailRsp
var
=
GetAllMailRsp
.
parseFrom
(
rsp
);
this
.
setData
(
var
.
toBuilder
().
build
());
}
catch
(
Exception
e
)
{}
}
}
}
}
}
}
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