diff --git a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java index da436c2c8..5c2bc526f 100644 --- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java +++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java @@ -19,11 +19,10 @@ import emu.grasscutter.net.proto.AbilityScalarTypeOuterClass.AbilityScalarType; import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry; import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction; import io.netty.util.concurrent.FastThreadLocalThread; -import lombok.Getter; -import org.reflections.Reflections; - import java.util.HashMap; import java.util.concurrent.*; +import lombok.Getter; +import org.reflections.Reflections; public final class AbilityManager extends BasePlayerManager { @@ -543,8 +542,8 @@ public final class AbilityManager extends BasePlayerManager { var scene = this.getPlayer().getScene(); var entity = scene.getEntityById(invoke.getEntityId()); if (entity == null) { - Grasscutter.getLogger().trace("Entity of ID {} was not found in the scene.", - invoke.getEntityId()); + Grasscutter.getLogger() + .trace("Entity of ID {} was not found in the scene.", invoke.getEntityId()); return; } @@ -552,8 +551,9 @@ public final class AbilityManager extends BasePlayerManager { if (killState.getKilled()) { scene.killEntity(entity); } else if (!entity.isAlive()) { - entity.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, - entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP)); + entity.setFightProperty( + FightProperty.FIGHT_PROP_CUR_HP, + entity.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP)); } } diff --git a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java index 419d5fbf4..b8d5a58c9 100644 --- a/src/main/java/emu/grasscutter/game/entity/EntityGadget.java +++ b/src/main/java/emu/grasscutter/game/entity/EntityGadget.java @@ -10,6 +10,7 @@ import emu.grasscutter.game.entity.gadget.platform.BaseRoute; import emu.grasscutter.game.player.Player; import emu.grasscutter.game.props.*; import emu.grasscutter.game.world.*; +import emu.grasscutter.net.proto.*; import emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo; import emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPair; import emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo; @@ -17,7 +18,6 @@ import emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData; import emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo; import emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq; import emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo; -import emu.grasscutter.net.proto.*; import emu.grasscutter.net.proto.PropPairOuterClass.PropPair; import emu.grasscutter.net.proto.ProtEntityTypeOuterClass.ProtEntityType; import emu.grasscutter.net.proto.SceneEntityAiInfoOuterClass.SceneEntityAiInfo; @@ -30,10 +30,9 @@ import emu.grasscutter.scripts.data.*; import emu.grasscutter.server.packet.send.*; import emu.grasscutter.utils.helpers.ProtoHelper; import it.unimi.dsi.fastutil.ints.*; -import lombok.*; - -import javax.annotation.Nullable; import java.util.*; +import javax.annotation.Nullable; +import lombok.*; @ToString(callSuper = true) public class EntityGadget extends EntityBaseGadget {