forked from MagicBane/Server
Refactor out itembase
This commit is contained in:
@@ -52,7 +52,7 @@ public class Item extends AbstractWorldObject {
|
||||
private boolean isRandom = false;
|
||||
private int value;
|
||||
public OwnerType ownerType;
|
||||
public int templsteID;
|
||||
public int templateID;
|
||||
private AbstractWorldObject lastOwner;
|
||||
private long dateToUpgrade;
|
||||
private String customName = "";
|
||||
@@ -67,7 +67,7 @@ public class Item extends AbstractWorldObject {
|
||||
|
||||
public Item(int templateID) {
|
||||
super();
|
||||
this.templsteID = templateID;
|
||||
this.templateID = templateID;
|
||||
this.template = ItemTemplate.itemTemplates.get(templateID);
|
||||
this.chargesRemaining = this.template.item_initial_charges;
|
||||
this.durabilityCurrent = this.template.combat_health_full;
|
||||
@@ -84,11 +84,11 @@ public class Item extends AbstractWorldObject {
|
||||
public Item(ResultSet rs) throws SQLException {
|
||||
super(rs);
|
||||
|
||||
this.templsteID = rs.getInt("item_itemBaseID");
|
||||
this.template = ItemTemplate.itemTemplates.get(this.templsteID);
|
||||
this.templateID = rs.getInt("item_itemBaseID");
|
||||
this.template = ItemTemplate.itemTemplates.get(this.templateID);
|
||||
|
||||
if (this.template == null)
|
||||
Logger.error("Null template of " + this.templsteID)
|
||||
Logger.error("Null template of " + this.templateID)
|
||||
;
|
||||
// Set container enumeration
|
||||
|
||||
@@ -227,7 +227,7 @@ public class Item extends AbstractWorldObject {
|
||||
writer.putInt(0); // Pad
|
||||
writer.putInt(0); // Pad
|
||||
|
||||
if (item.getItemBase().equals(ItemBase.GOLD_ITEM_BASE)) {
|
||||
if (item.templateID == ResourceType.GOLD.templateID) {
|
||||
|
||||
if (item.getOwner() != null && item.getOwner().getObjectType() == GameObjectType.PlayerCharacter) {
|
||||
PlayerCharacter player = (PlayerCharacter) item.getOwner();
|
||||
@@ -660,11 +660,11 @@ public class Item extends AbstractWorldObject {
|
||||
}
|
||||
|
||||
public ItemBase getItemBase() {
|
||||
return ItemBase.getItemBase(templsteID);
|
||||
return ItemBase.getItemBase(templateID);
|
||||
}
|
||||
|
||||
public int getTemplsteID() {
|
||||
return this.templsteID;
|
||||
public int getTemplateID() {
|
||||
return this.templateID;
|
||||
}
|
||||
|
||||
public int getOwnerID() {
|
||||
@@ -1012,7 +1012,7 @@ public class Item extends AbstractWorldObject {
|
||||
if (this.customName.isEmpty() == false)
|
||||
return this.customName;
|
||||
|
||||
ItemTemplate template = ItemTemplate.itemTemplates.get(this.getTemplsteID());
|
||||
ItemTemplate template = ItemTemplate.itemTemplates.get(this.getTemplateID());
|
||||
return template.item_base_name;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user