diff --git a/src/resources/objects/intangible/IntangibleObject.java b/src/resources/objects/intangible/IntangibleObject.java index 4dce5c3a6..db37c4240 100644 --- a/src/resources/objects/intangible/IntangibleObject.java +++ b/src/resources/objects/intangible/IntangibleObject.java @@ -1,6 +1,10 @@ package resources.objects.intangible; +import network.packets.swg.zone.SceneEndBaselines; +import network.packets.swg.zone.baselines.Baseline.BaselineType; +import resources.network.BaselineBuilder; import resources.objects.SWGObject; +import resources.player.Player; public class IntangibleObject extends SWGObject { @@ -17,5 +21,30 @@ public class IntangibleObject extends SWGObject { public void setCount(int count) { this.count = count; } + + public void createBaseline3(Player target, BaselineBuilder bb) { + super.createBaseline3(target, bb); + bb.addInt(count); + } + + public void createBaseline6(Player target, BaselineBuilder bb) { + super.createBaseline6(target, bb); + } + + public void createObject(Player target) { + super.sendSceneCreateObject(target); + + BaselineBuilder bb = new BaselineBuilder(this, BaselineType.ITNO, 3); + createBaseline3(target, bb); + bb.sendTo(target); + + // Probably won't need to send this as it only contains server id. Game will not crash if you exclude this baseline (PLAY6 is only one who sends this atm) + bb = new BaselineBuilder(this, BaselineType.ITNO, 6); + createBaseline6(target, bb); + bb.sendTo(target); + + createChildrenObjects(target); + target.sendPacket(new SceneEndBaselines(getObjectId())); + } } diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java index 91244f302..ddc2ac26b 100644 --- a/src/resources/objects/player/PlayerObject.java +++ b/src/resources/objects/player/PlayerObject.java @@ -112,7 +112,6 @@ public class PlayerObject extends IntangibleObject { public void createBaseline3(Player target, BaselineBuilder bb) { super.createBaseline3(target, bb); - bb.addInt(0); bb.addInt(4); // Flags List Size for (int i = 0; i < 4; i++) // 4 flags bb.addInt(0);