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

Merge branch 'lakebane-jobs' into lakebane

Browse Source 
# Conflicts:
#	src/engine/gameManager/CombatManager.java
#	src/engine/gameManager/PowersManager.java
#	src/engine/mobileAI/MobAI.java
#	src/engine/objects/Experience.java
#	src/engine/objects/PlayerCharacter.java
#	src/engine/objects/PlayerCombatStats.java
#	src/engine/util/KeyCloneAudit.java
#	src/engine/workthreads/UpdateThread.java
This commit is contained in:
FatBoy-DOTC
2025-03-03 18:42:25 -06:00
parent bbcbd6fc39 ef9c431d5e
commit e49fc398ed
49 changed files with 1909 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/MobEquipment.java
+2 -2
View File
@@ -278,14 +278,14 @@ public class MobEquipment extends AbstractGameObject {
EffectsBase effect = PowersManager.getEffectByToken(token);
AbstractPowerAction apa = PowersManager.getPowerActionByIDString(effect.getIDString());
if (apa.getEffectsBase() != null)
if (apa != null && apa.getEffectsBase() != null)
if (apa.getEffectsBase().getValue() > 0) {
//System.out.println(apa.getEffectsBase().getValue());
value += apa.getEffectsBase().getValue();
}
if (apa.getEffectsBase2() != null)
if (apa != null && apa.getEffectsBase2() != null)
value += apa.getEffectsBase2().getValue();
}