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
3ea9e157
Commit
3ea9e157
authored
3 years ago
by
Melledy
Browse files
Options
Downloads
Patches
Plain Diff
Make co-op players spawn into the host's scene too
parent
dd8d1752
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/emu/grasscutter/game/managers/MultiplayerManager.java
+17
-14
17 additions, 14 deletions
...ava/emu/grasscutter/game/managers/MultiplayerManager.java
with
17 additions
and
14 deletions
src/main/java/emu/grasscutter/game/managers/MultiplayerManager.java
+
17
−
14
View file @
3ea9e157
...
...
@@ -58,25 +58,25 @@ public class MultiplayerManager {
target
.
sendPacket
(
new
PacketPlayerApplyEnterMpNotify
(
player
));
}
public
void
applyEnterMpReply
(
GenshinPlayer
p
layer
,
int
applyUid
,
boolean
isAgreed
)
{
public
void
applyEnterMpReply
(
GenshinPlayer
hostP
layer
,
int
applyUid
,
boolean
isAgreed
)
{
// Checks
CoopRequest
request
=
p
layer
.
getCoopRequests
().
get
(
applyUid
);
CoopRequest
request
=
hostP
layer
.
getCoopRequests
().
get
(
applyUid
);
if
(
request
==
null
||
request
.
isExpired
())
{
return
;
}
// Remove now that we are handling it
GenshinPlayer
requester
=
request
.
getRequester
();
p
layer
.
getCoopRequests
().
remove
(
applyUid
);
hostP
layer
.
getCoopRequests
().
remove
(
applyUid
);
// Sanity checks - Dont let player join if already in multiplayer
// Sanity checks - Dont let
the requesting
player join if
they are
already in multiplayer
if
(
requester
.
getWorld
().
isMultiplayer
())
{
request
.
getRequester
().
sendPacket
(
new
PacketPlayerApplyEnterMpResultNotify
(
p
layer
,
false
,
PlayerApplyEnterMpReason
.
PlayerCannotEnterMp
));
request
.
getRequester
().
sendPacket
(
new
PacketPlayerApplyEnterMpResultNotify
(
hostP
layer
,
false
,
PlayerApplyEnterMpReason
.
PlayerCannotEnterMp
));
return
;
}
// Response packet
request
.
getRequester
().
sendPacket
(
new
PacketPlayerApplyEnterMpResultNotify
(
p
layer
,
isAgreed
,
PlayerApplyEnterMpReason
.
PlayerJudge
));
request
.
getRequester
().
sendPacket
(
new
PacketPlayerApplyEnterMpResultNotify
(
hostP
layer
,
isAgreed
,
PlayerApplyEnterMpReason
.
PlayerJudge
));
// Declined
if
(!
isAgreed
)
{
...
...
@@ -84,24 +84,27 @@ public class MultiplayerManager {
}
// Success
if
(!
p
layer
.
getWorld
().
isMultiplayer
())
{
if
(!
hostP
layer
.
getWorld
().
isMultiplayer
())
{
// Player not in multiplayer, create multiplayer world
World
world
=
new
World
(
p
layer
,
true
);
World
world
=
new
World
(
hostP
layer
,
true
);
// Add
world
.
addPlayer
(
p
layer
);
world
.
addPlayer
(
hostP
layer
);
// Rejoin packet
p
layer
.
sendPacket
(
new
PacketPlayerEnterSceneNotify
(
p
layer
,
p
layer
,
EnterType
.
EnterSelf
,
EnterReason
.
HostFromSingleToMp
,
p
layer
.
getScene
().
getId
(),
p
layer
.
getPos
()));
hostP
layer
.
sendPacket
(
new
PacketPlayerEnterSceneNotify
(
hostP
layer
,
hostP
layer
,
EnterType
.
EnterSelf
,
EnterReason
.
HostFromSingleToMp
,
hostP
layer
.
getScene
().
getId
(),
hostP
layer
.
getPos
()));
}
// Make requester join
player
.
getWorld
().
addPlayer
(
requester
);
hostPlayer
.
getWorld
().
addPlayer
(
requester
);
// Set scene pos and id of requester to the host player's
requester
.
getPos
().
set
(
hostPlayer
.
getPos
());
requester
.
getRotation
().
set
(
hostPlayer
.
getRotation
());
requester
.
setSceneId
(
hostPlayer
.
getSceneId
());
// Packet
requester
.
sendPacket
(
new
PacketPlayerEnterSceneNotify
(
requester
,
player
,
EnterType
.
EnterOther
,
EnterReason
.
TeamJoin
,
player
.
getScene
().
getId
(),
player
.
getPos
()));
requester
.
getPos
().
set
(
player
.
getPos
());
requester
.
getRotation
().
set
(
player
.
getRotation
());
requester
.
sendPacket
(
new
PacketPlayerEnterSceneNotify
(
requester
,
hostPlayer
,
EnterType
.
EnterOther
,
EnterReason
.
TeamJoin
,
hostPlayer
.
getScene
().
getId
(),
hostPlayer
.
getPos
()));
}
public
boolean
leaveCoop
(
GenshinPlayer
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