Browse Source

Equipment slot refactor started.

combat-2
MagicBot 8 months ago
parent
commit
a9dc7b1c5b
  1. 2
      src/engine/db/handlers/dbItemHandler.java
  2. 11
      src/engine/objects/MobEquipment.java

2
src/engine/db/handlers/dbItemHandler.java

@ -92,7 +92,7 @@ public class dbItemHandler extends dbHandlerBase {
break; break;
} }
preparedStatement.setByte(8, toAdd.getEquipSlot()); preparedStatement.setByte(8, (byte) toAdd.equipSlot.ordinal());
preparedStatement.setInt(9, toAdd.getFlags()); preparedStatement.setInt(9, toAdd.getFlags());
preparedStatement.setString(10, toAdd.getCustomName()); preparedStatement.setString(10, toAdd.getCustomName());

11
src/engine/objects/MobEquipment.java

@ -9,12 +9,12 @@
package engine.objects; package engine.objects;
import engine.Enum;
import engine.exception.SerializationException; import engine.exception.SerializationException;
import engine.gameManager.PowersManager; import engine.gameManager.PowersManager;
import engine.net.ByteBufferWriter; import engine.net.ByteBufferWriter;
import engine.powers.EffectsBase; import engine.powers.EffectsBase;
import engine.powers.poweractions.AbstractPowerAction; import engine.powers.poweractions.AbstractPowerAction;
import org.pmw.tinylog.Logger;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -61,13 +61,8 @@ public class MobEquipment extends AbstractGameObject {
this.itemBase = ItemBase.getItemBase(itemBaseID); this.itemBase = ItemBase.getItemBase(itemBaseID);
this.template = ItemTemplate.itemTemplates.get(itemBaseID); this.template = ItemTemplate.itemTemplates.get(itemBaseID);
if (this.itemBase != null) Enum.EquipSlotType equipSlot = template.item_eq_slots_and.iterator().next();
this.slot = this.itemBase.getValidSlot(); this.slot = equipSlot.ordinal();
else {
Logger.error("Failed to find Itembase for ID : " + itemBaseID);
this.slot = 0;
}
this.dropChance = dropChance; this.dropChance = dropChance;
this.parentID = 0; this.parentID = 0;

Loading…
Cancel
Save