mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-08-05 12:02:53 +00:00
Merge diff from krnlyng:
Adjust item spawn, to allow for match native names.
This commit is contained in:
parent
db50d455df
commit
47c8217511
3 changed files with 7 additions and 2 deletions
|
@ -163,6 +163,11 @@ public class ItemDb implements IConf
|
||||||
metaData = durabilities.get(itemname);
|
metaData = durabilities.get(itemname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(Material.getMaterial(itemname) != null)
|
||||||
|
{
|
||||||
|
itemid = Material.getMaterial(itemname).getId();
|
||||||
|
metaData = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw new Exception(Util.format("unknownItemName", id));
|
throw new Exception(Util.format("unknownItemName", id));
|
||||||
|
|
|
@ -50,7 +50,7 @@ public class Commandgive extends EssentialsCommand
|
||||||
}
|
}
|
||||||
|
|
||||||
User giveTo = getPlayer(server, args, 0);
|
User giveTo = getPlayer(server, args, 0);
|
||||||
String itemName = stack.getType().name().toLowerCase().replace('_', ' ');
|
String itemName = stack.getType().toString().toLowerCase().replace('_', ' ');
|
||||||
charge(sender);
|
charge(sender);
|
||||||
sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
|
sender.sendMessage(ChatColor.BLUE + "Giving " + stack.getAmount() + " of " + itemName + " to " + giveTo.getDisplayName() + ".");
|
||||||
giveTo.getInventory().addItem(stack);
|
giveTo.getInventory().addItem(stack);
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class Commanditem extends EssentialsCommand
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
String itemName = stack.getType().name().toLowerCase().replace('_', ' ');
|
String itemName = stack.getType().toString().toLowerCase().replace('_', ' ');
|
||||||
charge(user);
|
charge(user);
|
||||||
user.sendMessage(Util.format("itemSpawn", stack.getAmount(), itemName));
|
user.sendMessage(Util.format("itemSpawn", stack.getAmount(), itemName));
|
||||||
user.getInventory().addItem(stack);
|
user.getInventory().addItem(stack);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue