projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-05 20:12:51 -04:00
Code Issues Projects Releases Wiki Activity

Fixed some merge issues with creature refactor.

Browse Source
This commit is contained in:
Treeku
2014-08-16 23:02:01 +01:00
parent e5d4a633bf
commit 231a476441
10 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+14 -5
View File
@@ -1384,6 +1384,20 @@ public class CreatureObject extends TangibleObject implements IPersistent {
return adder.intValue();
}
public CreatureObject getCalledPet() {
if (getPlayerObject() == null) {
return null;
}
return (CreatureObject) NGECore.getInstance().objectService.getObject(getPlayerObject().getPet());
}
public void setCalledPet(CreatureObject calledPet) {
if (getPlayerObject() != null) {
getPlayerObject().setPet((calledPet == null) ? 0L : calledPet.getObjectID());
}
}
public void sendSystemMessage(String message, byte displayType) {
sendSystemMessage(message, new OutOfBand(), displayType);
}
@@ -1454,11 +1468,6 @@ public class CreatureObject extends TangibleObject implements IPersistent {
}
}
// PetId can be got from PlayerObject. Also is a duplicate of getCompanion().
@Deprecated public CreatureObject getCalledPet() { return ((getPlayerObject() == null) ? null : (CreatureObject) NGECore.getInstance().objectService.getObject(getPlayerObject().getPet())); }
@Deprecated public void setCalledPet(CreatureObject calledPet) { }
@Deprecated public void playMusicSelf(String sndFile, long targetId, int repetitions, boolean flag) { playMusic(sndFile, targetId, repetitions, flag); }
@Deprecated public void setXpBarValue(int xpBarValue) { setDisplayXp(xpBarValue); }