diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-08-10 10:45:24 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-08-10 10:45:24 +0100 |
commit | 2241e079757b1d2c7aa76cde424a4aaff73fff84 (patch) | |
tree | 70e114fe1fdd90f974da67a6d19581e81f6c7bac | |
parent | 59d83f21e8c948c35c947c2e08e807aacf5cb405 (diff) | |
download | Essentials-2241e079757b1d2c7aa76cde424a4aaff73fff84.tar Essentials-2241e079757b1d2c7aa76cde424a4aaff73fff84.tar.gz Essentials-2241e079757b1d2c7aa76cde424a4aaff73fff84.tar.lz Essentials-2241e079757b1d2c7aa76cde424a4aaff73fff84.tar.xz Essentials-2241e079757b1d2c7aa76cde424a4aaff73fff84.zip |
Merge diff from krnlyng:
Adjust item spawn, to allow for match native names.
3 files changed, 7 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/ItemDb.java b/Essentials/src/com/earth2me/essentials/ItemDb.java index d7e534341..8e05b17fb 100644 --- a/Essentials/src/com/earth2me/essentials/ItemDb.java +++ b/Essentials/src/com/earth2me/essentials/ItemDb.java @@ -163,6 +163,11 @@ public class ItemDb implements IConf metaData = durabilities.get(itemname); } } + else if(Material.getMaterial(itemname) != null) + { + itemid = Material.getMaterial(itemname).getId(); + metaData = 0; + } else { throw new Exception(Util.format("unknownItemName", id)); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java index b029df098..21eea2c70 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgive.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgive.java @@ -50,7 +50,7 @@ public class Commandgive extends EssentialsCommand } User giveTo = getPlayer(server, args, 0); - String itemName = stack.getType().name().toLowerCase().replace('_', ' '); + String itemName = stack.getType().toString().toLowerCase().replace('_', ' '); charge(sender); sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + "."); giveTo.getInventory().addItem(stack); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java index 4961f714d..79e8344f1 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commanditem.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commanditem.java @@ -46,7 +46,7 @@ public class Commanditem extends EssentialsCommand return; } - String itemName = stack.getType().name().toLowerCase().replace('_', ' '); + String itemName = stack.getType().toString().toLowerCase().replace('_', ' '); charge(user); user.sendMessage(Util.format("itemSpawn", stack.getAmount(), itemName)); user.getInventory().addItem(stack); |