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
e9f5d984
Commit
e9f5d984
authored
Sep 16, 2022
by
github-actions
Browse files
Fix whitespace [skip actions]
parent
08f36195
Changes
4
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/entity/EntityGadget.java
View file @
e9f5d984
...
...
@@ -53,7 +53,7 @@ public class EntityGadget extends EntityBaseGadget {
public
EntityGadget
(
Scene
scene
,
int
gadgetId
,
Position
pos
,
Position
rot
)
{
super
(
scene
);
this
.
data
=
GameData
.
getGadgetDataMap
().
get
(
gadgetId
);
if
(
data
!=
null
&&
data
.
getJsonName
()!=
null
)
{
if
(
data
!=
null
&&
data
.
getJsonName
()!=
null
)
{
this
.
configGadget
=
GameData
.
getGadgetConfigData
().
get
(
data
.
getJsonName
());
}
this
.
id
=
getScene
().
getWorld
().
getNextEntityId
(
EntityIdType
.
GADGET
);
...
...
src/main/java/emu/grasscutter/game/entity/EntityMonster.java
View file @
e9f5d984
...
...
@@ -293,7 +293,7 @@ public class EntityMonster extends GameEntity {
monsterInfo
.
addWeaponList
(
weaponInfo
);
}
if
(
this
.
aiId
!=-
1
){
if
(
this
.
aiId
!=-
1
)
{
monsterInfo
.
setAiConfigId
(
aiId
);
}
...
...
src/main/java/emu/grasscutter/game/player/TeamManager.java
View file @
e9f5d984
...
...
@@ -626,10 +626,10 @@ public class TeamManager extends BasePlayerDataManager {
}
// Teleport player and set player position
try
{
try
{
this
.
getPlayer
().
sendPacket
(
new
PacketPlayerEnterSceneNotify
(
this
.
getPlayer
(),
EnterType
.
ENTER_TYPE_SELF
,
EnterReason
.
Revival
,
player
.
getSceneId
(),
getRespawnPosition
()));
player
.
getPosition
().
set
(
getRespawnPosition
());
}
catch
(
Exception
e
){
}
catch
(
Exception
e
)
{
this
.
getPlayer
().
sendPacket
(
new
PacketPlayerEnterSceneNotify
(
this
.
getPlayer
(),
EnterType
.
ENTER_TYPE_SELF
,
EnterReason
.
Revival
,
3
,
GameConstants
.
START_POSITION
));
player
.
getPosition
().
set
(
GameConstants
.
START_POSITION
);
// If something goes wrong, the resurrection is here
}
...
...
src/main/java/emu/grasscutter/game/props/EntityType.java
View file @
e9f5d984
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