More ordinal refactor
This commit is contained in:
@@ -22,7 +22,7 @@ public class MobEquipment extends AbstractGameObject {
|
||||
|
||||
private static AtomicInteger equipCounter = new AtomicInteger(0);
|
||||
private final ItemBase itemBase;
|
||||
private int slot;
|
||||
public Enum.EquipSlotType slot;
|
||||
private int parentID;
|
||||
|
||||
//effects
|
||||
@@ -41,7 +41,7 @@ public class MobEquipment extends AbstractGameObject {
|
||||
/**
|
||||
* No Id Constructor
|
||||
*/
|
||||
public MobEquipment(ItemBase itemBase, int slot, int parentID) {
|
||||
public MobEquipment(ItemBase itemBase, Enum.EquipSlotType slot, int parentID) {
|
||||
super(MobEquipment.getNewID());
|
||||
this.itemBase = itemBase;
|
||||
this.templateID = this.itemBase.getUUID();
|
||||
@@ -62,7 +62,8 @@ public class MobEquipment extends AbstractGameObject {
|
||||
this.template = ItemTemplate.itemTemplates.get(itemBaseID);
|
||||
|
||||
Enum.EquipSlotType equipSlot = template.item_eq_slots_and.iterator().next();
|
||||
this.slot = equipSlot.ordinal();
|
||||
|
||||
this.slot = equipSlot;
|
||||
this.dropChance = dropChance;
|
||||
|
||||
this.parentID = 0;
|
||||
@@ -86,7 +87,7 @@ public class MobEquipment extends AbstractGameObject {
|
||||
public static void _serializeForClientMsg(MobEquipment mobEquipment, ByteBufferWriter writer, boolean useSlot) throws SerializationException {
|
||||
|
||||
if (useSlot)
|
||||
writer.putInt(mobEquipment.slot);
|
||||
writer.putInt(mobEquipment.slot.ordinal());
|
||||
writer.putInt(0); // Pad
|
||||
writer.putInt(mobEquipment.itemBase.getUUID());
|
||||
writer.putInt(mobEquipment.getObjectType().ordinal());
|
||||
@@ -209,15 +210,6 @@ public class MobEquipment extends AbstractGameObject {
|
||||
public ItemBase getItemBase() {
|
||||
return itemBase;
|
||||
}
|
||||
|
||||
public int getSlot() {
|
||||
return this.slot;
|
||||
}
|
||||
|
||||
public void setSlot(int value) {
|
||||
this.slot = value;
|
||||
}
|
||||
|
||||
public final void setMagicValue() {
|
||||
float value = 1;
|
||||
if (itemBase != null)
|
||||
|
||||
Reference in New Issue
Block a user