Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
6e5d9866
Commit
6e5d9866
authored
Sep 03, 2022
by
github-actions
Browse files
Fix whitespace [skip actions]
parent
005a0bce
Changes
24
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/server/packet/send/PacketAvatarTeamUpdateNotify.java
View file @
6e5d9866
...
...
@@ -11,17 +11,17 @@ import emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam;
import
emu.grasscutter.net.proto.AvatarTeamUpdateNotifyOuterClass.AvatarTeamUpdateNotify
;
public
class
PacketAvatarTeamUpdateNotify
extends
BasePacket
{
public
PacketAvatarTeamUpdateNotify
(
Player
player
)
{
super
(
PacketOpcodes
.
AvatarTeamUpdateNotify
);
AvatarTeamUpdateNotify
.
Builder
proto
=
AvatarTeamUpdateNotify
.
newBuilder
();
for
(
Entry
<
Integer
,
TeamInfo
>
entry
:
player
.
getTeamManager
().
getTeams
().
entrySet
())
{
TeamInfo
teamInfo
=
entry
.
getValue
();
proto
.
putAvatarTeamMap
(
entry
.
getKey
(),
teamInfo
.
toProto
(
player
));
}
this
.
setData
(
proto
);
}
public
PacketAvatarTeamUpdateNotify
(
Player
player
)
{
super
(
PacketOpcodes
.
AvatarTeamUpdateNotify
);
AvatarTeamUpdateNotify
.
Builder
proto
=
AvatarTeamUpdateNotify
.
newBuilder
();
for
(
Entry
<
Integer
,
TeamInfo
>
entry
:
player
.
getTeamManager
().
getTeams
().
entrySet
())
{
TeamInfo
teamInfo
=
entry
.
getValue
();
proto
.
putAvatarTeamMap
(
entry
.
getKey
(),
teamInfo
.
toProto
(
player
));
}
this
.
setData
(
proto
);
}
}
src/main/java/emu/grasscutter/server/packet/send/PacketCreateVehicleRsp.java
View file @
6e5d9866
...
...
@@ -17,33 +17,33 @@ import java.util.List;
public
class
PacketCreateVehicleRsp
extends
BasePacket
{
public
PacketCreateVehicleRsp
(
Player
player
,
int
vehicleId
,
int
pointId
,
Position
pos
,
Position
rot
)
{
super
(
PacketOpcodes
.
CreateVehicleRsp
);
CreateVehicleRsp
.
Builder
proto
=
CreateVehicleRsp
.
newBuilder
();
public
PacketCreateVehicleRsp
(
Player
player
,
int
vehicleId
,
int
pointId
,
Position
pos
,
Position
rot
)
{
super
(
PacketOpcodes
.
CreateVehicleRsp
);
CreateVehicleRsp
.
Builder
proto
=
CreateVehicleRsp
.
newBuilder
();
// Eject vehicle members and Kill previous vehicles if there are any
List
<
GameEntity
>
previousVehicles
=
player
.
getScene
().
getEntities
().
values
().
stream
()
.
filter
(
entity
->
entity
instanceof
EntityVehicle
&&
((
EntityVehicle
)
entity
).
getGadgetId
()
==
vehicleId
&&
((
EntityVehicle
)
entity
).
getOwner
().
equals
(
player
))
.
toList
();
// Eject vehicle members and Kill previous vehicles if there are any
List
<
GameEntity
>
previousVehicles
=
player
.
getScene
().
getEntities
().
values
().
stream
()
.
filter
(
entity
->
entity
instanceof
EntityVehicle
&&
((
EntityVehicle
)
entity
).
getGadgetId
()
==
vehicleId
&&
((
EntityVehicle
)
entity
).
getOwner
().
equals
(
player
))
.
toList
();
previousVehicles
.
stream
().
forEach
(
entity
->
{
List
<
VehicleMember
>
vehicleMembers
=
((
EntityVehicle
)
entity
).
getVehicleMembers
().
stream
().
toList
();
previousVehicles
.
stream
().
forEach
(
entity
->
{
List
<
VehicleMember
>
vehicleMembers
=
((
EntityVehicle
)
entity
).
getVehicleMembers
().
stream
().
toList
();
vehicleMembers
.
stream
().
forEach
(
vehicleMember
->
{
player
.
getScene
().
broadcastPacket
(
new
PacketVehicleInteractRsp
(((
EntityVehicle
)
entity
),
vehicleMember
,
VehicleInteractTypeOuterClass
.
VehicleInteractType
.
VEHICLE_INTERACT_TYPE_OUT
));
});
vehicleMembers
.
stream
().
forEach
(
vehicleMember
->
{
player
.
getScene
().
broadcastPacket
(
new
PacketVehicleInteractRsp
(((
EntityVehicle
)
entity
),
vehicleMember
,
VehicleInteractTypeOuterClass
.
VehicleInteractType
.
VEHICLE_INTERACT_TYPE_OUT
));
});
player
.
getScene
().
killEntity
(
entity
,
0
);
});
player
.
getScene
().
killEntity
(
entity
,
0
);
});
EntityVehicle
vehicle
=
new
EntityVehicle
(
player
.
getScene
(),
player
,
vehicleId
,
pointId
,
pos
,
rot
);
player
.
getScene
().
addEntity
(
vehicle
);
EntityVehicle
vehicle
=
new
EntityVehicle
(
player
.
getScene
(),
player
,
vehicleId
,
pointId
,
pos
,
rot
);
player
.
getScene
().
addEntity
(
vehicle
);
proto
.
setVehicleId
(
vehicleId
);
proto
.
setEntityId
(
vehicle
.
getId
());
proto
.
setVehicleId
(
vehicleId
);
proto
.
setEntityId
(
vehicle
.
getId
());
this
.
setData
(
proto
.
build
());
}
this
.
setData
(
proto
.
build
());
}
}
src/main/java/emu/grasscutter/server/packet/send/PacketCustomTeamListNotify.java
View file @
6e5d9866
...
...
@@ -28,7 +28,7 @@ public class PacketCustomTeamListNotify extends BasePacket {
TeamInfo
teamInfo
=
entry
.
getValue
();
proto
.
putAvatarTeamMap
(
entry
.
getKey
(),
teamInfo
.
toProto
(
player
));
}
this
.
setData
(
proto
);
}
}
src/main/java/emu/grasscutter/server/packet/send/PacketRemoveCustomTeamRsp.java
View file @
6e5d9866
...
...
@@ -13,7 +13,7 @@ public class PacketRemoveCustomTeamRsp extends BasePacket {
.
setRetcode
(
retcode
.
getNumber
())
.
setId
(
id
)
.
build
();
this
.
setData
(
proto
);
}
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment