projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Fixed calculatePvpStatus

Browse Source
This commit is contained in:
Treeku
2014-05-03 15:32:07 +01:00
parent 883163768d
commit dba74a6ebc
5 changed files with 146 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+5
View File
@@ -41,6 +41,7 @@ import protocol.swg.objectControllerObjects.ShowFlyText;
import resources.common.OutOfBand;
import resources.common.RGB;
import resources.datatables.Options;
import resources.datatables.PvpStatus;
import resources.loot.LootGroup;
import resources.objects.ObjectMessageBuilder;
import resources.objects.creature.CreatureObject;
@@ -399,7 +400,10 @@ public class TangibleObject extends SWGObject implements Serializable {
}
public boolean isAttackableBy(CreatureObject attacker) {
int pvpStatus = NGECore.getInstance().factionService.calculatePvpStatus(attacker, this);
return (((pvpStatus & PvpStatus.Attackable) == PvpStatus.Attackable) || ((pvpStatus & PvpStatus.Aggressive) == PvpStatus.Aggressive));
/*
CreatureObject creature;
if(this instanceof CreatureObject) {
@@ -436,6 +440,7 @@ public class TangibleObject extends SWGObject implements Serializable {
return true;
return getPvPBitmask() == 1 || getPvPBitmask() == 2;
*/
}
public void showFlyText(OutOfBand outOfBand, float scale, RGB color, int displayType, boolean notifyObservers) {