TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-24 06:23:59 +00:00
Code Issues Projects Releases Wiki Activity

[trunk] Worth/Sell: Support for double values as prices and more important: support for data items.

Browse source 
the yaml structure has changed, there is a fallback to the old structure.

This code is untested.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1211 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-04-16 06:28:56 +00:00
parent cf144b1a64
commit c849bf7fe9
4 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/commands/Commandsell.java
View file

@ -2,6 +2,7 @@ package com.earth2me.essentials.commands;
import org.bukkit.Server;
import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.InventoryWorkaround;
import com.earth2me.essentials.User;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
@ -24,7 +25,7 @@ public class Commandsell extends EssentialsCommand
int id = is.getTypeId();
int amount = 0;
if (args.length > 0) amount = Integer.parseInt(args[0].replaceAll("[^0-9]", ""));
int worth = Essentials.getWorth().getPrice(String.valueOf(id));
double worth = Essentials.getWorth().getPrice(is);
boolean stack = args.length > 0 && args[0].endsWith("s");
boolean requireStack = parent.getConfiguration().getBoolean("trade-in-stacks-" + id, false);
@ -34,6 +35,8 @@ public class Commandsell extends EssentialsCommand
int max = 0;
for (ItemStack s : user.getInventory().all(is).values())
{
if (s.getDurability() != is.getDurability())
continue;
max += s.getAmount();
}
@ -54,7 +57,7 @@ public class Commandsell extends EssentialsCommand
}
user.charge(this);
user.getInventory().removeItem(new ItemStack(id, amount));
InventoryWorkaround.removeItem(user.getInventory(), true, new ItemStack(is.getType(), amount, is.getDurability()));
user.updateInventory();
user.giveMoney(worth * amount);
user.sendMessage("§7Sold for §c$" + (worth * amount) + "§7 (" + amount + " items at $" + worth + " each)");