projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-21 11:03:13 -04:00
Code Issues Projects Releases Wiki Activity

Moved additional things to the PSWGCommon library

Browse Source
This commit is contained in:
Obique PSWG
2017-04-15 15:31:11 -05:00
parent a0e6304be9
commit c147448cf2
364 changed files with 1403 additions and 9450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+19 -8
View File
@@ -31,11 +31,16 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.Locale;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Stream;
import com.projectswg.common.data.CRC;
import com.projectswg.common.encoding.StringType;
import com.projectswg.common.network.NetBuffer;
import com.projectswg.common.network.NetBufferStream;
import network.packets.swg.zone.UpdatePostureMessage;
import network.packets.swg.zone.UpdatePvpStatusMessage;
import network.packets.swg.zone.baselines.Baseline.BaselineType;
@@ -48,10 +53,7 @@ import resources.PvpStatus;
import resources.Race;
import resources.collections.SWGList;
import resources.collections.SWGSet;
import resources.common.CRC;
import resources.network.BaselineBuilder;
import resources.network.NetBuffer;
import resources.network.NetBufferStream;
import resources.objects.SWGObject;
import resources.objects.player.PlayerObject;
import resources.objects.tangible.TangibleObject;
@@ -59,7 +61,6 @@ import resources.objects.weapon.WeaponObject;
import resources.persistable.SWGObjectFactory;
import resources.player.Player;
import services.group.GroupInviterData;
import utilities.Encoder.StringType;
public class CreatureObject extends TangibleObject {
@@ -846,6 +847,7 @@ public class CreatureObject extends TangibleObject {
return super.hashCode() * 20 + race.toString().hashCode();
}
@Override
public void sendBaselines(Player target) {
boolean targetSelf = getOwner() == target;
@@ -865,6 +867,7 @@ public class CreatureObject extends TangibleObject {
}
}
@Override
protected void sendFinalBaselinePackets(Player target) {
super.sendFinalBaselinePackets(target);
@@ -876,6 +879,7 @@ public class CreatureObject extends TangibleObject {
}
}
@Override
public void createBaseline1(Player target, BaselineBuilder bb) {
super.createBaseline1(target, bb); // 0 variables
if (getStringId().toString().equals("@obj_n:unknown_object"))
@@ -888,6 +892,7 @@ public class CreatureObject extends TangibleObject {
bb.incrementOperandCount(4);
}
@Override
public void createBaseline3(Player target, BaselineBuilder bb) {
super.createBaseline3(target, bb); // 13 variables - TANO3 (9) + BASE3 (4)
if (getStringId().toString().equals("@obj_n:unknown_object"))
@@ -902,6 +907,7 @@ public class CreatureObject extends TangibleObject {
bb.incrementOperandCount(6);
}
@Override
public void createBaseline4(Player target, BaselineBuilder bb) {
super.createBaseline4(target, bb); // 0 variables
if (getStringId().toString().equals("@obj_n:unknown_object"))
@@ -909,6 +915,7 @@ public class CreatureObject extends TangibleObject {
creo4.createBaseline4(target, bb);
}
@Override
public void createBaseline6(Player target, BaselineBuilder bb) {
super.createBaseline6(target, bb); // 8 variables - TANO6 (6) + BASE6 (2)
if (getStringId().toString().equals("@obj_n:unknown_object"))
@@ -916,16 +923,18 @@ public class CreatureObject extends TangibleObject {
creo6.createBaseline6(target, bb);
}
@Override
protected void parseBaseline1(NetBuffer buffer) {
super.parseBaseline1(buffer);
if (getStringId().toString().equals("@obj_n:unknown_object"))
return;
bankBalance = buffer.getInt();
cashBalance = buffer.getInt();
baseAttributes = buffer.getSwgList(1, 2, Integer.class);
skills = buffer.getSwgSet(1, 3, StringType.ASCII);
baseAttributes = SWGList.getSwgList(buffer, 1, 2, Integer.class);
skills = SWGSet.getSwgSet(buffer, 1, 3, StringType.ASCII);
}
@Override
protected void parseBaseline3(NetBuffer buffer) {
super.parseBaseline3(buffer);
if (getStringId().toString().equals("@obj_n:unknown_object"))
@@ -938,6 +947,7 @@ public class CreatureObject extends TangibleObject {
statesBitmask = buffer.getLong();
}
@Override
protected void parseBaseline4(NetBuffer buffer) {
super.parseBaseline4(buffer);
if (getStringId().toString().equals("@obj_n:unknown_object"))
@@ -945,6 +955,7 @@ public class CreatureObject extends TangibleObject {
creo4.parseBaseline4(buffer);
}
@Override
protected void parseBaseline6(NetBuffer buffer) {
super.parseBaseline6(buffer);
if (getStringId().toString().equals("@obj_n:unknown_object"))
@@ -1000,7 +1011,7 @@ public class CreatureObject extends TangibleObject {
statesBitmask = stream.getLong();
factionRank = stream.getByte();
if (stream.getBoolean()) {
SWGObject defaultWeapon = (WeaponObject) SWGObjectFactory.create(stream);
SWGObject defaultWeapon = SWGObjectFactory.create(stream);
defaultWeapon.moveToContainer(this); // The weapon will be moved into the default_weapon slot
}
stream.getList((i) -> skills.add(stream.getAscii()));