projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

temp fix for /pvp

Browse Source
This commit is contained in:
Light2
2014-03-29 21:00:51 +01:00
parent dce91cc2d2
commit 4fe5e6614e
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/tangible/TangibleObject.java
+4 -1
View File
@@ -223,7 +223,7 @@ public class TangibleObject extends SWGObject {
}
}
updatePvpStatus();
//updatePvpStatus();
}
public void updatePvpStatus() {
@@ -234,7 +234,10 @@ public class TangibleObject extends SWGObject {
if (observer.getParent() != null) {
observer.getSession().write(new UpdatePVPStatusMessage(this.getObjectID(), NGECore.getInstance().factionService.calculatePvpStatus((CreatureObject) observer.getParent(), this), getFaction()).serialize());
if(getClient() != null)
getClient().getSession().write(new UpdatePVPStatusMessage(observer.getParent().getObjectID(), NGECore.getInstance().factionService.calculatePvpStatus((CreatureObject) this, (CreatureObject) observer.getParent()), getFaction()).serialize());
}
}
}