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
aedfb598
Commit
aedfb598
authored
3 years ago
by
Melledy
Browse files
Options
Downloads
Patches
Plain Diff
Remove duplicate function and fix stackoverflow issue
parent
06a50365
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/emu/grasscutter/game/GenshinPlayer.java
+0
-9
0 additions, 9 deletions
src/main/java/emu/grasscutter/game/GenshinPlayer.java
src/main/java/emu/grasscutter/server/game/GameServer.java
+1
-1
1 addition, 1 deletion
src/main/java/emu/grasscutter/server/game/GameServer.java
with
1 addition
and
10 deletions
src/main/java/emu/grasscutter/game/GenshinPlayer.java
+
0
−
9
View file @
aedfb598
...
@@ -571,15 +571,6 @@ public class GenshinPlayer {
...
@@ -571,15 +571,6 @@ public class GenshinPlayer {
public
void
sendMessage
(
GenshinPlayer
sender
,
Object
message
)
{
public
void
sendMessage
(
GenshinPlayer
sender
,
Object
message
)
{
this
.
sendPacket
(
new
PacketPrivateChatNotify
(
sender
.
getUid
(),
this
.
getUid
(),
message
.
toString
()));
this
.
sendPacket
(
new
PacketPrivateChatNotify
(
sender
.
getUid
(),
this
.
getUid
(),
message
.
toString
()));
}
}
/**
* Sends a message to another player.
* @param sender The sender of the message.
* @param message The message to send.
*/
public
void
sendMessage
(
GenshinPlayer
sender
,
Object
message
)
{
this
.
sendPacket
(
new
PacketPrivateChatNotify
(
sender
.
getId
(),
this
.
getId
(),
message
.
toString
()));
}
public
void
interactWith
(
int
gadgetEntityId
)
{
public
void
interactWith
(
int
gadgetEntityId
)
{
GenshinEntity
entity
=
getScene
().
getEntityById
(
gadgetEntityId
);
GenshinEntity
entity
=
getScene
().
getEntityById
(
gadgetEntityId
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/emu/grasscutter/server/game/GameServer.java
+
1
−
1
View file @
aedfb598
...
@@ -118,7 +118,7 @@ public final class GameServer extends MihoyoKcpServer {
...
@@ -118,7 +118,7 @@ public final class GameServer extends MihoyoKcpServer {
}
}
// Get from online players
// Get from online players
GenshinPlayer
player
=
this
.
getPlayer
ByUid
(
id
);
GenshinPlayer
player
=
this
.
getPlayer
s
().
get
(
id
);
if
(!
allowOfflinePlayers
)
{
if
(!
allowOfflinePlayers
)
{
return
player
;
return
player
;
...
...
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