From cdf3e4db8a964c14030826356dce3280a81b7bbf Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 21 Jul 2024 22:00:09 -0400 Subject: [PATCH] Update sourcetype --- src/engine/gameManager/PowersManager.java | 8 ++++---- src/engine/jobs/FinishSummonsJob.java | 2 +- src/engine/net/client/handlers/RecvSummonsMsgHandler.java | 2 +- .../powers/effectmodifiers/BlackMantleEffectModifier.java | 2 +- .../powers/effectmodifiers/NoModEffectModifier.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/engine/gameManager/PowersManager.java b/src/engine/gameManager/PowersManager.java index b91069a8..bf2103bb 100644 --- a/src/engine/gameManager/PowersManager.java +++ b/src/engine/gameManager/PowersManager.java @@ -348,7 +348,7 @@ public enum PowersManager { // verify player is not stunned or prohibited from casting PlayerBonuses bonus = playerCharacter.getBonuses(); - SourceType sourceType = EffectSourceType.GetSourceType(pb.getCategory()); + EffectSourceType sourceType = EffectSourceType.getEffectSourceType(pb.getCategory()); if (bonus != null && (bonus.getBool(ModType.Stunned, EffectSourceType.None) || bonus.getBool(ModType.CannotCast, EffectSourceType.None) || bonus.getBool(ModType.BlockedPowerType, sourceType))) return true; @@ -631,7 +631,7 @@ public enum PowersManager { // verify player is in correct mode (combat/nonCombat) // verify player is not stunned or prohibited from casting PlayerBonuses bonus = caster.getBonuses(); - SourceType sourceType = EffectSourceType.GetSourceType(pb.getCategory()); + EffectSourceType sourceType = EffectSourceType.getEffectSourceType(pb.getCategory()); if (bonus != null && (bonus.getBool(ModType.Stunned, EffectSourceType.None) || bonus.getBool(ModType.CannotCast, EffectSourceType.None) || bonus.getBool(ModType.BlockedPowerType, sourceType))) return true; @@ -795,7 +795,7 @@ public enum PowersManager { if (bonus.getBool(ModType.Stunned, EffectSourceType.None)) return; - SourceType sourceType = EffectSourceType.GetSourceType(pb.getCategory()); + EffectSourceType sourceType = EffectSourceType.getEffectSourceType(pb.getCategory()); if (bonus.getBool(ModType.BlockedPowerType, sourceType)) { finishRecycleTime(msg.getPowerUsedID(), playerCharacter, true); return; @@ -1067,7 +1067,7 @@ public enum PowersManager { if (bonus != null) { if (bonus.getBool(ModType.Stunned, EffectSourceType.None)) return; - SourceType sourceType = EffectSourceType.GetSourceType(pb.getCategory()); + EffectSourceType sourceType = EffectSourceType.getEffectSourceType(pb.getCategory()); if (bonus.getBool(ModType.BlockedPowerType, sourceType)) return; } diff --git a/src/engine/jobs/FinishSummonsJob.java b/src/engine/jobs/FinishSummonsJob.java index 83f5556c..a9ad9723 100644 --- a/src/engine/jobs/FinishSummonsJob.java +++ b/src/engine/jobs/FinishSummonsJob.java @@ -55,7 +55,7 @@ public class FinishSummonsJob extends AbstractScheduleJob { return; } - if (this.target.getBonuses() != null && this.target.getBonuses().getBool(ModType.BlockedPowerType, EffectSourceType.SUMMON)) { + if (this.target.getBonuses() != null && this.target.getBonuses().getBool(ModType.BlockedPowerType, EffectSourceType.Summon)) { ErrorPopupMsg.sendErrorMsg(this.target, "You have been blocked from receiving summons!"); ErrorPopupMsg.sendErrorMsg(this.source, "Target is blocked from receiving summons!"); return; diff --git a/src/engine/net/client/handlers/RecvSummonsMsgHandler.java b/src/engine/net/client/handlers/RecvSummonsMsgHandler.java index f8bc7d5e..16e1e9df 100644 --- a/src/engine/net/client/handlers/RecvSummonsMsgHandler.java +++ b/src/engine/net/client/handlers/RecvSummonsMsgHandler.java @@ -58,7 +58,7 @@ public class RecvSummonsMsgHandler extends AbstractClientMsgHandler { return true; } - if (playerCharacter.getBonuses() != null && playerCharacter.getBonuses().getBool(mbEnums.ModType.BlockedPowerType, mbEnums.EffectSourceType.SUMMON)) { + if (playerCharacter.getBonuses() != null && playerCharacter.getBonuses().getBool(mbEnums.ModType.BlockedPowerType, mbEnums.EffectSourceType.Summon)) { ErrorPopupMsg.sendErrorMsg(playerCharacter, "You have been blocked from receiving summons!"); ErrorPopupMsg.sendErrorMsg(source, "Target is blocked from receiving summons!"); playerCharacter.removeSummoner(source.getObjectUUID()); diff --git a/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java b/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java index d40c5aeb..cfd958ab 100644 --- a/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java +++ b/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java @@ -33,7 +33,7 @@ public class BlackMantleEffectModifier extends AbstractEffectModifier { @Override public void applyBonus(AbstractCharacter ac, int trains) { PlayerBonuses bonus = ac.getBonuses(); - SourceType sourceType = EffectSourceType.valueOf(this.type); + EffectSourceType sourceType = EffectSourceType.valueOf(this.type); if (sourceType == null) { Logger.error("Bad Source Type for " + this.type); diff --git a/src/engine/powers/effectmodifiers/NoModEffectModifier.java b/src/engine/powers/effectmodifiers/NoModEffectModifier.java index 63c8cb90..349c7ad0 100644 --- a/src/engine/powers/effectmodifiers/NoModEffectModifier.java +++ b/src/engine/powers/effectmodifiers/NoModEffectModifier.java @@ -33,7 +33,7 @@ public class NoModEffectModifier extends AbstractEffectModifier { bonus.setBool(this.modType, this.sourceType, true); switch (this.sourceType) { - case Fly: + case Flight: if (!ac.getObjectType().equals(GameObjectType.PlayerCharacter)) return; PlayerCharacter flyer = (PlayerCharacter) ac;