Merged quality_assurance into CORE-137-travel

This commit is contained in:
Mads Boddum
2015-09-29 11:37:34 +02:00
16 changed files with 816 additions and 176 deletions
@@ -36,6 +36,7 @@ import network.packets.swg.zone.baselines.Baseline.BaselineType;
import network.packets.swg.zone.object_controller.PostureUpdate;
import resources.HologramColour;
import resources.Posture;
import resources.PvpFlag;
import resources.Race;
import resources.collections.SWGList;
import resources.collections.SWGMap;
@@ -780,7 +781,7 @@ public class CreatureObject extends TangibleObject {
target.sendPacket(new UpdatePostureMessage(posture.getId(), getObjectId()));
if (getOwner() != null && target != getOwner()) {
target.sendPacket(new UpdatePvpStatusMessage(UpdatePvpStatusMessage.PLAYER, 0, getObjectId()));
target.sendPacket(new UpdatePvpStatusMessage(PvpFlag.PLAYER, 0, getObjectId()));
}
}