Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-05-19 01:39:51 +08:00
Code Issues Projects Releases Wiki Activity

Format code [skip actions]

Browse Source
This commit is contained in:
github-actions
2023-11-05 19:58:28 +00:00
Unverified
parent d224178a64
commit 1fac319eb2
3 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/emu/grasscutter/game/ability/AbilityManager.java
+21 -11
View File
@@ -85,16 +85,24 @@ public final class AbilityManager extends BasePlayerManager {
boolean skillInvincibility = modifier.state == AbilityModifier.State.Invincible;
if (modifier.onAdded != null) {
skillInvincibility |= Arrays.stream(modifier.onAdded)
.filter(action ->
action.type == AbilityModifierAction.Type.AttachAbilityStateResistance &&
action.resistanceListID == 11002)
.toList().size() > 0;
skillInvincibility |=
Arrays.stream(modifier.onAdded)
.filter(
action ->
action.type == AbilityModifierAction.Type.AttachAbilityStateResistance
&& action.resistanceListID == 11002)
.toList()
.size()
> 0;
}
if (this.clearBurstEnergy != null && this.burstCasterId == entityId &&
(ability.getAvatarSkillStartIds().contains(this.burstSkillId) || skillInvincibility)) {
Grasscutter.getLogger().trace("Caster ID's {} burst successful, clearing energy and setting invulnerability", entityId);
if (this.clearBurstEnergy != null
&& this.burstCasterId == entityId
&& (ability.getAvatarSkillStartIds().contains(this.burstSkillId) || skillInvincibility)) {
Grasscutter.getLogger()
.trace(
"Caster ID's {} burst successful, clearing energy and setting invulnerability",
entityId);
this.abilityInvulnerable = true;
this.clearBurstEnergy.accept(entityId);
this.removePendingEnergyClear();
@@ -329,9 +337,11 @@ public final class AbilityManager extends BasePlayerManager {
}
// Track this elemental burst to possibly clear avatar energy later.
this.clearBurstEnergy = (ignored) ->
player.getEnergyManager().handleEvtDoSkillSuccNotify(
player.getSession(), skillId, casterId);
this.clearBurstEnergy =
(ignored) ->
player
.getEnergyManager()
.handleEvtDoSkillSuccNotify(player.getSession(), skillId, casterId);
this.burstCasterId = casterId;
this.burstSkillId = skillId;
}