mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-14 07:55:57 +01:00
Run formatter & 'protogen'
This commit is contained in:
@@ -20,11 +20,10 @@ import emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalar
|
||||
import emu.grasscutter.net.proto.ModifierActionOuterClass.ModifierAction;
|
||||
import emu.grasscutter.server.event.player.PlayerUseSkillEvent;
|
||||
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 {
|
||||
private static final HashMap<AbilityModifierAction.Type, AbilityActionHandler> actionHandlers =
|
||||
@@ -276,8 +275,7 @@ public final class AbilityManager extends BasePlayerManager {
|
||||
}
|
||||
|
||||
// Invoke PlayerUseSkillEvent.
|
||||
var event = new PlayerUseSkillEvent(player,
|
||||
skillData, currentAvatar.getAvatar());
|
||||
var event = new PlayerUseSkillEvent(player, skillData, currentAvatar.getAvatar());
|
||||
if (!event.call()) return;
|
||||
|
||||
// Check if the skill is an elemental burst.
|
||||
|
||||
@@ -14,12 +14,11 @@ import emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePass
|
||||
import emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule;
|
||||
import emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus;
|
||||
import emu.grasscutter.server.packet.send.*;
|
||||
import lombok.Getter;
|
||||
import org.bson.types.ObjectId;
|
||||
|
||||
import java.time.*;
|
||||
import java.time.temporal.TemporalAdjusters;
|
||||
import java.util.*;
|
||||
import lombok.Getter;
|
||||
import org.bson.types.ObjectId;
|
||||
|
||||
@Entity(value = "battlepass", useDiscriminator = false)
|
||||
public class BattlePassManager extends BasePlayerDataManager {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package emu.grasscutter.game.gacha;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
|
||||
|
||||
import com.sun.nio.file.SensitivityWatchEventModifier;
|
||||
import emu.grasscutter.Grasscutter;
|
||||
import emu.grasscutter.data.*;
|
||||
@@ -21,13 +23,10 @@ import emu.grasscutter.server.game.*;
|
||||
import emu.grasscutter.server.packet.send.PacketDoGachaRsp;
|
||||
import emu.grasscutter.utils.*;
|
||||
import it.unimi.dsi.fastutil.ints.*;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
|
||||
import java.nio.file.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
|
||||
public class GachaSystem extends BaseGameSystem {
|
||||
private static final int starglitterId = 221;
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package emu.grasscutter.game.player;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
|
||||
|
||||
import dev.morphia.annotations.*;
|
||||
import emu.grasscutter.*;
|
||||
import emu.grasscutter.data.GameData;
|
||||
@@ -21,12 +23,9 @@ import emu.grasscutter.server.packet.send.*;
|
||||
import emu.grasscutter.utils.Utils;
|
||||
import it.unimi.dsi.fastutil.ints.*;
|
||||
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static emu.grasscutter.config.Configuration.GAME_OPTIONS;
|
||||
import lombok.*;
|
||||
|
||||
@Entity
|
||||
public final class TeamManager extends BasePlayerDataManager {
|
||||
@@ -426,12 +425,11 @@ public final class TeamManager extends BasePlayerDataManager {
|
||||
|
||||
// Check if character changed
|
||||
var newAvatarEntity = this.getCurrentAvatarEntity();
|
||||
if (currentEntity != null &&
|
||||
newAvatarEntity != null &&
|
||||
currentEntity != newAvatarEntity) {
|
||||
if (currentEntity != null && newAvatarEntity != null && currentEntity != newAvatarEntity) {
|
||||
// Call PlayerSwitchAvatarEvent.
|
||||
var event = new PlayerSwitchAvatarEvent(this.getPlayer(),
|
||||
currentEntity.getAvatar(), newAvatarEntity.getAvatar());
|
||||
var event =
|
||||
new PlayerSwitchAvatarEvent(
|
||||
this.getPlayer(), currentEntity.getAvatar(), newAvatarEntity.getAvatar());
|
||||
if (!event.call()) return;
|
||||
|
||||
// Remove and Add
|
||||
@@ -766,8 +764,8 @@ public final class TeamManager extends BasePlayerDataManager {
|
||||
}
|
||||
|
||||
// Call PlayerSwitchAvatarEvent.
|
||||
var event = new PlayerSwitchAvatarEvent(this.getPlayer(),
|
||||
oldEntity.getAvatar(), newEntity.getAvatar());
|
||||
var event =
|
||||
new PlayerSwitchAvatarEvent(this.getPlayer(), oldEntity.getAvatar(), newEntity.getAvatar());
|
||||
if (!event.call()) return;
|
||||
|
||||
newEntity = event.getNewAvatarEntity();
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package emu.grasscutter.game.talk;
|
||||
|
||||
import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
|
||||
import static emu.grasscutter.game.quest.enums.QuestContent.*;
|
||||
|
||||
import emu.grasscutter.data.GameData;
|
||||
import emu.grasscutter.data.binout.MainQuestData.TalkData;
|
||||
import emu.grasscutter.game.player.*;
|
||||
import emu.grasscutter.server.event.player.PlayerNpcTalkEvent;
|
||||
import lombok.NonNull;
|
||||
|
||||
import static emu.grasscutter.game.quest.enums.QuestCond.QUEST_COND_COMPLETE_TALK;
|
||||
import static emu.grasscutter.game.quest.enums.QuestContent.*;
|
||||
|
||||
public final class TalkManager extends BasePlayerManager {
|
||||
public TalkManager(@NonNull Player player) {
|
||||
super(player);
|
||||
|
||||
@@ -431,7 +431,7 @@ public final class Scene {
|
||||
.map(this::removeEntityDirectly)
|
||||
.filter(Objects::nonNull)
|
||||
.toList();
|
||||
if (toRemove.size() > 0) {
|
||||
if (!toRemove.isEmpty()) {
|
||||
this.broadcastPacket(new PacketSceneEntityDisappearNotify(toRemove, visionType));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user