From 27d495742d9652f80b3a60c15f5814fa8e9b9237 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Jul 2023 03:05:16 +0000 Subject: [PATCH] Format code [skip actions] --- src/main/java/emu/grasscutter/game/world/Scene.java | 7 +++---- .../server/packet/recv/HandlerEnterSceneDoneReq.java | 8 ++------ .../packet/send/PacketServerGlobalValueChangeNotify.java | 8 ++++---- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/main/java/emu/grasscutter/game/world/Scene.java b/src/main/java/emu/grasscutter/game/world/Scene.java index 3370db26e..103a6d53c 100644 --- a/src/main/java/emu/grasscutter/game/world/Scene.java +++ b/src/main/java/emu/grasscutter/game/world/Scene.java @@ -22,8 +22,8 @@ import emu.grasscutter.game.props.*; import emu.grasscutter.game.quest.QuestGroupSuite; import emu.grasscutter.game.world.data.TeleportProperties; import emu.grasscutter.net.packet.BasePacket; -import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult; import emu.grasscutter.net.proto.*; +import emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult; import emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType; import emu.grasscutter.scripts.*; import emu.grasscutter.scripts.constants.EventType; @@ -33,12 +33,11 @@ import emu.grasscutter.server.event.player.PlayerTeleportEvent; import emu.grasscutter.server.packet.send.*; import emu.grasscutter.utils.objects.KahnsSort; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import lombok.*; - -import javax.annotation.Nullable; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; +import javax.annotation.Nullable; +import lombok.*; public final class Scene { @Getter private final World world; diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java index 5e6057c95..4e6d5ba33 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerEnterSceneDoneReq.java @@ -37,15 +37,11 @@ public class HandlerEnterSceneDoneReq extends PacketHandler { player.getScene().loadNpcForPlayerEnter(player); // notify client to load the npc for quest - var questGroupSuites = - player.getQuestManager().getSceneGroupSuite(player.getSceneId()); + var questGroupSuites = player.getQuestManager().getSceneGroupSuite(player.getSceneId()); player.getScene().loadGroupForQuest(questGroupSuites); Grasscutter.getLogger() - .trace( - "Loaded Scene {} Quest(s) Groupsuite(s): {}", - player.getSceneId(), - questGroupSuites); + .trace("Loaded Scene {} Quest(s) Groupsuite(s): {}", player.getSceneId(), questGroupSuites); session.send(new PacketGroupSuiteNotify(questGroupSuites)); // Reset timer for sending player locations diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java b/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java index e1498ca91..b270a15f0 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketServerGlobalValueChangeNotify.java @@ -21,9 +21,9 @@ public final class PacketServerGlobalValueChangeNotify extends BasePacket { super(PacketOpcodes.ServerGlobalValueChangeNotify); this.setData( - ServerGlobalValueChangeNotify.newBuilder() - .setEntityId(entityId) - .setValue(value) - .setKeyHash(Utils.abilityHash(abilityHash))); + ServerGlobalValueChangeNotify.newBuilder() + .setEntityId(entityId) + .setValue(value) + .setKeyHash(Utils.abilityHash(abilityHash))); } }