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

player character attacks added to city outlaws

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-09-10 11:57:52 -05:00
parent e7c3ba5eba
commit 46e67be8ca
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+9 -4
View File
@@ -14,10 +14,7 @@ import engine.Enum.*;
import engine.InterestManagement.InterestManager; import engine.InterestManagement.InterestManager;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.exception.SerializationException; import engine.exception.SerializationException;
import engine.gameManager.CombatManager; import engine.gameManager.*;
import engine.gameManager.ConfigManager;
import engine.gameManager.MovementManager;
import engine.gameManager.PowersManager;
import engine.job.AbstractJob; import engine.job.AbstractJob;
import engine.job.JobContainer; import engine.job.JobContainer;
import engine.job.JobScheduler; import engine.job.JobScheduler;
@@ -1254,6 +1251,14 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
target.guardedCity.cityOutlaws.add(attacker.getObjectUUID()); target.guardedCity.cityOutlaws.add(attacker.getObjectUUID());
} }
} }
} else if(this.getObjectType().equals(GameObjectType.PlayerCharacter)){
City playerCity = ZoneManager.getCityAtLocation(this.loc);
if(playerCity != null){
if(!attacker.getGuild().getNation().equals(playerCity.getGuild().getNation()))
if(!playerCity.getGuild().getNation().getAllyList().contains(attacker.getGuild().getNation()))
if(!playerCity.cityOutlaws.contains(attacker.getObjectUUID()))
playerCity.cityOutlaws.add(attacker.getObjectUUID());
}
} }
return newHealth - oldHealth; return newHealth - oldHealth;
} finally { } finally {