diff --git a/src/main/java/emu/grasscutter/game/world/Scene.java b/src/main/java/emu/grasscutter/game/world/Scene.java index 32252780d..2c8d8c735 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/game/world/World.java b/src/main/java/emu/grasscutter/game/world/World.java index 59e884d2e..46f5d60b7 100644 --- a/src/main/java/emu/grasscutter/game/world/World.java +++ b/src/main/java/emu/grasscutter/game/world/World.java @@ -1,5 +1,7 @@ package emu.grasscutter.game.world; +import static emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType.SCRIPT; + import emu.grasscutter.data.GameData; import emu.grasscutter.data.excels.dungeon.DungeonData; import emu.grasscutter.game.entity.*; @@ -18,13 +20,10 @@ import emu.grasscutter.server.game.GameServer; import emu.grasscutter.server.packet.send.*; import emu.grasscutter.utils.ConversionUtils; import it.unimi.dsi.fastutil.ints.*; +import java.util.*; import lombok.*; import org.jetbrains.annotations.NotNull; -import java.util.*; - -import static emu.grasscutter.server.event.player.PlayerTeleportEvent.TeleportType.SCRIPT; - public class World implements Iterable { @Getter private final GameServer server; @Getter private final Player host; @@ -158,11 +157,8 @@ public class World implements Iterable { player.getTeamManager().setCurrentCharacterIndex(0); if (player != this.getHost()) { - this.broadcastPacket(new PacketPlayerChatNotify( - player, 0, - SystemHint.newBuilder() - .setType(1).build() - )); + this.broadcastPacket( + new PacketPlayerChatNotify(player, 0, SystemHint.newBuilder().setType(1).build())); } } @@ -218,11 +214,8 @@ public class World implements Iterable { victim.getPosition())); } } else { - this.broadcastPacket(new PacketPlayerChatNotify( - player, 0, - SystemHint.newBuilder() - .setType(2).build() - )); + this.broadcastPacket( + new PacketPlayerChatNotify(player, 0, SystemHint.newBuilder().setType(2).build())); } }