diff --git a/gameserver/src/main/java/brainwine/gameserver/command/commands/GiveCommand.java b/gameserver/src/main/java/brainwine/gameserver/command/commands/GiveCommand.java index fde0659..5dee646 100644 --- a/gameserver/src/main/java/brainwine/gameserver/command/commands/GiveCommand.java +++ b/gameserver/src/main/java/brainwine/gameserver/command/commands/GiveCommand.java @@ -49,12 +49,12 @@ public class GiveCommand extends Command { if(quantity > 0) { target.getInventory().addItem(item, quantity); - target.alert(String.format("You received %s %s from an administrator.", quantity, item.getName())); - executor.sendMessage(String.format("Gave %s %s to %s", quantity, item.getName(), target.getName())); + target.alert(String.format("You received %s %s from an administrator.", quantity, item.getTitle())); + executor.sendMessage(String.format("Gave %s %s to %s", quantity, item.getTitle(), target.getName())); } else { target.getInventory().removeItem(item, -quantity); - target.alert(String.format("%s %s was taken from your inventory.", -quantity, item.getName())); - executor.sendMessage(String.format("Took %s %s from %s", quantity, item.getName(), target.getName())); + target.alert(String.format("%s %s was taken from your inventory.", -quantity, item.getTitle())); + executor.sendMessage(String.format("Took %s %s from %s", quantity, item.getTitle(), target.getName())); } } diff --git a/gameserver/src/main/java/brainwine/gameserver/item/Item.java b/gameserver/src/main/java/brainwine/gameserver/item/Item.java index 91eadb1..d489942 100644 --- a/gameserver/src/main/java/brainwine/gameserver/item/Item.java +++ b/gameserver/src/main/java/brainwine/gameserver/item/Item.java @@ -31,6 +31,9 @@ public class Item { @JacksonInject("name") private String name; + @JsonProperty("title") + private String title; + @JsonProperty("layer") private Layer layer = Layer.NONE; @@ -97,6 +100,10 @@ public class Item { return name; } + public String getTitle() { + return title; + } + public boolean isAir() { return id == 0; }