mirror of
https://github.com/EssentialsX/Essentials.git
synced 2025-01-10 18:38:18 +01:00
[trunk] Readded [balance] and [heal] sign code that was lost
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1090 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
parent
0efed42015
commit
348cb29469
@ -7,6 +7,7 @@ import org.bukkit.*;
|
|||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.Sign;
|
import org.bukkit.block.Sign;
|
||||||
import org.bukkit.craftbukkit.block.CraftSign;
|
import org.bukkit.craftbukkit.block.CraftSign;
|
||||||
|
import org.bukkit.craftbukkit.inventory.CraftInventory;
|
||||||
import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
|
import org.bukkit.craftbukkit.inventory.CraftInventoryPlayer;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.player.*;
|
import org.bukkit.event.player.*;
|
||||||
@ -295,6 +296,31 @@ public class EssentialsPlayerListener extends PlayerListener
|
|||||||
}
|
}
|
||||||
if (sign.getLine(0).equals("§1[Heal]") && user.isAuthorized("essentials.signs.heal.use"))
|
if (sign.getLine(0).equals("§1[Heal]") && user.isAuthorized("essentials.signs.heal.use"))
|
||||||
{
|
{
|
||||||
|
if (!sign.getLine(1).isEmpty()) {
|
||||||
|
String[] l1 = sign.getLine(1).split("[ :-]+");
|
||||||
|
boolean m1 = l1[0].matches("\\$[0-9]+");
|
||||||
|
int q1 = Integer.parseInt(m1 ? l1[0].substring(1) : l1[0]);
|
||||||
|
if (q1 < 1) {
|
||||||
|
throw new Exception("Quantities must be greater than 0.");
|
||||||
|
}
|
||||||
|
if (m1)
|
||||||
|
{
|
||||||
|
if (user.getMoney() < q1) {
|
||||||
|
throw new Exception("You do not have sufficient funds.");
|
||||||
|
}
|
||||||
|
user.takeMoney(q1);
|
||||||
|
user.sendMessage("$" + q1 + " taken from your bank account.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ItemStack i = ItemDb.get(l1[1], q1);
|
||||||
|
if (!InventoryWorkaround.containsItem((CraftInventory)user.getInventory(), true, i)) {
|
||||||
|
throw new Exception("You do not have " + q1 + "x " + l1[1] + ".");
|
||||||
|
}
|
||||||
|
InventoryWorkaround.removeItem((CraftInventory)user.getInventory(), true, i);
|
||||||
|
user.updateInventory();
|
||||||
|
}
|
||||||
|
}
|
||||||
user.setHealth(20);
|
user.setHealth(20);
|
||||||
user.sendMessage("§7You have been healed.");
|
user.sendMessage("§7You have been healed.");
|
||||||
return;
|
return;
|
||||||
@ -311,6 +337,11 @@ public class EssentialsPlayerListener extends PlayerListener
|
|||||||
user.sendMessage("§cTo mark your mail as read, type §c/mail clear");
|
user.sendMessage("§cTo mark your mail as read, type §c/mail clear");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (sign.getLine(0).equals("§1[Balance]") && user.isAuthorized("essentials.signs.balance.use"))
|
||||||
|
{
|
||||||
|
user.sendMessage("§7Balance: $" + user.getMoney());
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch (Throwable ex)
|
catch (Throwable ex)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user