Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 11:03:38 +00:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions 2023-11-09 02:16:38 +00:00
parent adf8031684
commit 2bcbd41026
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
View File

@ -23,7 +23,6 @@ import emu.grasscutter.server.event.player.PlayerUseSkillEvent;
import io.netty.util.concurrent.FastThreadLocalThread; import io.netty.util.concurrent.FastThreadLocalThread;
import java.util.*; import java.util.*;
import java.util.concurrent.*; import java.util.concurrent.*;
import java.util.function.Consumer;
import lombok.Getter; import lombok.Getter;
public final class AbilityManager extends BasePlayerManager { public final class AbilityManager extends BasePlayerManager {
@ -103,7 +102,8 @@ public final class AbilityManager extends BasePlayerManager {
this.abilityInvulnerable = true; this.abilityInvulnerable = true;
this.player this.player
.getEnergyManager() .getEnergyManager()
.handleEvtDoSkillSuccNotify(this.player.getSession(), this.burstSkillId, this.burstCasterId); .handleEvtDoSkillSuccNotify(
this.player.getSession(), this.burstSkillId, this.burstCasterId);
this.removePendingEnergyClear(); this.removePendingEnergyClear();
} }
} }

2
src/main/java/emu/grasscutter/game/tower/TowerManager.java
View File

@ -29,7 +29,7 @@ public class TowerManager extends BasePlayerManager {
return this.getTowerData().currentFloorId; return this.getTowerData().currentFloorId;
} }
/** floor number: 1 - 12 **/ /** floor number: 1 - 12 * */
public int getCurrentFloorNumber() { public int getCurrentFloorNumber() {
return GameData.getTowerFloorDataMap().get(getCurrentFloorId()).getFloorIndex(); return GameData.getTowerFloorDataMap().get(getCurrentFloorId()).getFloorIndex();
} }

3
src/main/java/emu/grasscutter/game/world/Scene.java
View File

@ -771,8 +771,7 @@ public class Scene {
if (getDungeonManager() != null) { if (getDungeonManager() != null) {
return getDungeonManager().getLevelForMonster(configId); return getDungeonManager().getLevelForMonster(configId);
} else if (getWorld().getWorldLevel() > 0) { } else if (getWorld().getWorldLevel() > 0) {
var worldLevelData = var worldLevelData = GameData.getWorldLevelDataMap().get(getWorld().getWorldLevel());
GameData.getWorldLevelDataMap().get(getWorld().getWorldLevel());
if (worldLevelData != null) { if (worldLevelData != null) {
return worldLevelData.getMonsterLevel(); return worldLevelData.getMonsterLevel();