forked from MagicBane/Server
Refactor of item.name; simplification.
This commit is contained in:
@@ -68,7 +68,6 @@ public class Item extends AbstractWorldObject {
|
||||
super();
|
||||
this.templateID = templateID;
|
||||
this.template = ItemTemplate.templates.get(templateID);
|
||||
this.name = this.template.item_base_name;
|
||||
this.chargesRemaining = this.template.item_initial_charges;
|
||||
this.durabilityCurrent = this.template.combat_health_full;
|
||||
this.equipSlot = EquipSlotType.NONE;
|
||||
@@ -90,12 +89,12 @@ public class Item extends AbstractWorldObject {
|
||||
if (this.template == null)
|
||||
Logger.error("Null template of " + this.templateID);
|
||||
|
||||
// Name override in db.
|
||||
|
||||
this.name = rs.getString("item_name");
|
||||
|
||||
if (this.name == null)
|
||||
this.name = this.template.item_base_name;
|
||||
else if (this.name.isEmpty())
|
||||
this.name = this.template.item_base_name;
|
||||
this.name = "";
|
||||
|
||||
// Set container enumeration
|
||||
|
||||
|
||||
Reference in New Issue
Block a user