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

combat null fix

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-25 20:40:37 -06:00
parent 547d222a2d
commit e4274994ff
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+2 -5
View File
@@ -809,10 +809,7 @@ public enum CombatManager {
float damage; float damage;
if (wb != null) damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
else
damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){ if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
damage *= ((PlayerCharacter)ac).ZergMultiplier; damage *= ((PlayerCharacter)ac).ZergMultiplier;
@@ -830,7 +827,7 @@ public enum CombatManager {
if (tarAc.getObjectType() == GameObjectType.Mob) { if (tarAc.getObjectType() == GameObjectType.Mob) {
if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)) { if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)) {
if(((Mob) tarAc).playerAgroMap.contains(ac.getObjectUUID())) { if(((Mob) tarAc).playerAgroMap.containsKey(ac.getObjectUUID())) {
((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), ((Mob) tarAc).playerAgroMap.get(ac.getObjectUUID()) + damage); ((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), ((Mob) tarAc).playerAgroMap.get(ac.getObjectUUID()) + damage);
} else{ } else{
((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), damage); ((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), damage);