Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

combat problem chasing

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-02-28 18:48:17 -06:00
parent 7ff879ea64
commit ce542ce319
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+15 -15
View File
@@ -821,25 +821,25 @@ public enum CombatManager {
//Subtract Damage from target's health //Subtract Damage from target's health
if (tarAc != null) { if (tarAc != null) {
if (tarAc.isSit())
damage *= 2.5f; //increase damage if sitting
if (tarAc.isSit()) if (tarAc.getObjectType() == GameObjectType.Mob) {
damage *= 2.5f; //increase damage if sitting Mob mobTarget = (Mob) tarAc;
if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)) {
if (mobTarget.playerAgroMap.containsKey(ac.getObjectUUID())) {
float hateValue = damage + mobTarget.playerAgroMap.get(ac.getObjectUUID());
mobTarget.playerAgroMap.put(ac.getObjectUUID(), hateValue);
} else {
mobTarget.playerAgroMap.put(ac.getObjectUUID(), damage);
}
if (tarAc.getObjectType() == GameObjectType.Mob) {
if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)) {
if(((Mob) tarAc).playerAgroMap.containsKey(ac.getObjectUUID())) {
((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), ((Mob) tarAc).playerAgroMap.get(ac.getObjectUUID()) + damage);
} else{
((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), damage);
} }
mobTarget.handleDirectAggro(ac);
} }
((Mob) tarAc).handleDirectAggro(ac);
}
if (tarAc.getHealth() > 0)
d = tarAc.modifyHealth(-damage, ac, false);
if (tarAc.getHealth() > 0)
d = tarAc.modifyHealth(-damage, ac, false);
} else if (target.getObjectType().equals(GameObjectType.Building)) { } else if (target.getObjectType().equals(GameObjectType.Building)) {
if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) { if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
@@ -950,7 +950,7 @@ public enum CombatManager {
} catch (Exception e) { } catch (Exception e) {
Logger.error(ac.getName() + ' ' + errorTrack + ' ' + e); Logger.error(ac.getName() + ' ' + errorTrack + ' ' + e);
e.printStackTrace(); Logger.error(e.getMessage());
} }
} }