MagicBane/Server
Template
434
1
Fork 5
Code Issues 6 Pull Requests Projects Releases Wiki Activity

atr check failure

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-03-09 10:42:50 -05:00
parent 67653febd5
commit aaa737649e
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/PowersManager.java
+11 -10
View File
@@ -850,14 +850,14 @@ public enum PowersManager {
// return; // return;
//} //}
if(HandleItemEnchantments(playerCharacter, msg)) { //if(HandleItemEnchantments(playerCharacter, msg)) {
playerCharacter.setIsCasting(false); // playerCharacter.setIsCasting(false);
PerformActionMsg castMsg = new PerformActionMsg(msg); // PerformActionMsg castMsg = new PerformActionMsg(msg);
castMsg.setNumTrains(9999); // castMsg.setNumTrains(9999);
castMsg.setUnknown04(2); // castMsg.setUnknown04(2);
DispatchMessage.dispatchMsgToInterestArea(playerCharacter, castMsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false); // DispatchMessage.dispatchMsgToInterestArea(playerCharacter, castMsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
return; // return;
} //}
PerformActionMsg performActionMsg; PerformActionMsg performActionMsg;
Dispatch dispatch; Dispatch dispatch;
@@ -3149,11 +3149,12 @@ public enum PowersManager {
// Logger.error(pc.getFirstName() + " failed to apply self buff: " + msg.getPowerUsedID()); // Logger.error(pc.getFirstName() + " failed to apply self buff: " + msg.getPowerUsedID());
//} //}
UsePowerJob asj =new UsePowerJob(pc,msg,eb.getToken(),pb,pc.getLiveCounter(),pc.getLiveCounter()); UsePowerJob asj = new UsePowerJob(pc,msg,pb.getToken(),pb,pc.getLiveCounter(),pc.getLiveCounter());
JobContainer jc = JobScheduler.getInstance().scheduleJob(asj, 1800000); JobContainer jc = JobScheduler.getInstance().scheduleJob(asj, 1800000);
Effect eff = new Effect(jc, eb, msg.getNumTrains()); Effect eff = new Effect(jc, eb, msg.getNumTrains());
pc.effects.put("CASTABLE", eff); // pc.effects.put("CASTABLE", eff);
pc.addEffect("CASTABLE",1800,asj,eb,msg.getNumTrains());
pc.applyAllBonuses(); pc.applyAllBonuses();
ApplyEffectMsg pum = new ApplyEffectMsg(); ApplyEffectMsg pum = new ApplyEffectMsg();
src/engine/objects/PlayerCombatStats.java
+12 -7
View File
@@ -6,6 +6,7 @@ import engine.powers.EffectsBase;
import engine.powers.PowersBase; import engine.powers.PowersBase;
import engine.powers.effectmodifiers.AbstractEffectModifier; import engine.powers.effectmodifiers.AbstractEffectModifier;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@@ -384,15 +385,19 @@ public class PlayerCombatStats {
} }
} }
} else { } else {
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { try {
if (mod.modType.equals(Enum.ModType.OCV)) { for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
if(mod.getPercentMod() == 0) { if (mod.modType.equals(Enum.ModType.OCV)) {
float value = mod.getMinMod(); if (mod.getPercentMod() == 0) {
int trains = this.owner.effects.get(effID).getTrains(); float value = mod.getMinMod();
float modValue = value + (trains * mod.getRamp()); int trains = this.owner.effects.get(effID).getTrains();
atrEnchants += modValue; float modValue = value + (trains * mod.getRamp());
atrEnchants += modValue;
}
} }
} }
}catch(Exception e){
//Logger.error(e.getMessage());
} }
} }
} }