Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-09 08:32:57 +08:00
Code Issues Projects Releases Wiki Activity

Fix whitespace [skip actions]

Browse Source
This commit is contained in:
github-actions 2022-09-16 17:04:44 +00:00
parent 08f361954a
commit e9f5d98466
4 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/entity/EntityGadget.java
View File

@ -53,7 +53,7 @@ public class EntityGadget extends EntityBaseGadget {
public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot) { public EntityGadget(Scene scene, int gadgetId, Position pos, Position rot) {
super(scene); super(scene);
this.data = GameData.getGadgetDataMap().get(gadgetId); 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.configGadget = GameData.getGadgetConfigData().get(data.getJsonName());
} }
this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET); this.id = getScene().getWorld().getNextEntityId(EntityIdType.GADGET);

2
src/main/java/emu/grasscutter/game/entity/EntityMonster.java
View File

@ -293,7 +293,7 @@ public class EntityMonster extends GameEntity {
monsterInfo.addWeaponList(weaponInfo); monsterInfo.addWeaponList(weaponInfo);
} }
if(this.aiId!=-1){ if (this.aiId!=-1) {
monsterInfo.setAiConfigId(aiId); monsterInfo.setAiConfigId(aiId);
} }

4
src/main/java/emu/grasscutter/game/player/TeamManager.java
View File

@ -626,10 +626,10 @@ public class TeamManager extends BasePlayerDataManager {
} }
// Teleport player and set player position // Teleport player and set player position
try{ try {
this.getPlayer().sendPacket(new PacketPlayerEnterSceneNotify(this.getPlayer(), EnterType.ENTER_TYPE_SELF, EnterReason.Revival, player.getSceneId(), getRespawnPosition())); this.getPlayer().sendPacket(new PacketPlayerEnterSceneNotify(this.getPlayer(), EnterType.ENTER_TYPE_SELF, EnterReason.Revival, player.getSceneId(), getRespawnPosition()));
player.getPosition().set(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)); 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 player.getPosition().set(GameConstants.START_POSITION); // If something goes wrong, the resurrection is here
} }