From 073417567f8c5f472d60b37a846b236bd195ddff Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 26 Oct 2026 04:35:10 -0400 Subject: [PATCH] Remove the dead power 334 chant branches Both branches of the getUUID() != 334 checks were identical, and they tied the code to a DB row ID. Co-Authored-By: Claude Opus 5.5 --- src/engine/jobs/ChantJob.java | 6 +----- src/engine/powers/poweractions/ApplyEffectPowerAction.java | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/engine/jobs/ChantJob.java b/src/engine/jobs/ChantJob.java index 979d6d3e..b75dad8f 100644 --- a/src/engine/jobs/ChantJob.java +++ b/src/engine/jobs/ChantJob.java @@ -82,11 +82,7 @@ public class ChantJob extends AbstractEffectJob { } if (AbstractWorldObject.IsAbstractCharacter(source)) - //handle invul - if (power.getUUID() != 334) - ((AbstractCharacter) this.source).setLastChant((int) (this.power.getChantDuration()) * 1000, this); - else - ((AbstractCharacter) this.source).setLastChant((int) (this.power.getChantDuration()) * 1000, this); + ((AbstractCharacter) this.source).setLastChant((int) (this.power.getChantDuration()) * 1000, this); } else { PowersManager.finishEffectTime(this.source, this.target, this.action, this.trains); if (AbstractWorldObject.IsAbstractCharacter(source)) { diff --git a/src/engine/powers/poweractions/ApplyEffectPowerAction.java b/src/engine/powers/poweractions/ApplyEffectPowerAction.java index 169b8831..e6a18668 100644 --- a/src/engine/powers/poweractions/ApplyEffectPowerAction.java +++ b/src/engine/powers/poweractions/ApplyEffectPowerAction.java @@ -191,11 +191,7 @@ public class ApplyEffectPowerAction extends AbstractPowerAction { FinishEffectTimeJob eff = new FinishEffectTimeJob(source, target, stackType, trains, ab, pb, effect); ChantJob cj = new ChantJob(source, target, stackType, trains, ab, pb, effect, eff); - //handle invul - if (pb.getUUID() != 334) - source.setLastChant((int) (pb.getChantDuration()) * 1000, cj); - else - source.setLastChant((int) (pb.getChantDuration()) * 1000, cj); + source.setLastChant((int) (pb.getChantDuration()) * 1000, cj); eff.setChant(true); }