From 0f1eb9b4f910b4f61f4c89fbad14b6485c372756 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Dec 2011 16:04:15 +0100 Subject: Moved signs code to a new module --- .../earth2me/essentials/signs/SignSpawnmob.java | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java new file mode 100644 index 000000000..f21d937b3 --- /dev/null +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java @@ -0,0 +1,47 @@ +package com.earth2me.essentials.signs; + +import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.Trade; +import com.earth2me.essentials.api.IUser; +import com.earth2me.essentials.commands.Commandspawnmob; + + +public class SignSpawnmob extends EssentialsSign +{ + public SignSpawnmob() + { + super("Spawnmob"); + } + + @Override + protected boolean onSignCreate(ISign sign, IUser player, String username, IEssentials ess) throws SignException, ChargeException + { + validateInteger(sign, 1); + validateTrade(sign, 3, ess); + return true; + } + + @Override + protected boolean onSignInteract(ISign sign, IUser player, String username, IEssentials ess) throws SignException, ChargeException + { + final Trade charge = getTrade(sign, 3, ess); + charge.isAffordableFor(player); + Commandspawnmob command = new Commandspawnmob(); + command.setEssentials(ess); + String[] args = new String[] + { + sign.getLine(2), sign.getLine(1) + }; + try + { + command.run(ess.getServer(), player, "spawnmob", args); + } + catch (Exception ex) + { + throw new SignException(ex.getMessage(), ex); + } + charge.charge(player); + return true; + } +} -- cgit v1.2.3 From 3513d72a7b883701ba8d90c523da5af8bf4d0d07 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 4 Jan 2012 21:41:05 +0000 Subject: Fixing Warp, Spawnmob signs Fix Imports --- .../src/com/earth2me/essentials/signs/SignSpawnmob.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java index f21d937b3..58383782b 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.signs; import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.Trade; +import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.commands.Commandspawnmob; @@ -22,20 +22,22 @@ public class SignSpawnmob extends EssentialsSign return true; } + + //TODO: This should call a method not a command @Override protected boolean onSignInteract(ISign sign, IUser player, String username, IEssentials ess) throws SignException, ChargeException { final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player); - Commandspawnmob command = new Commandspawnmob(); - command.setEssentials(ess); + Commandspawnmob command = new Commandspawnmob(); + command.init(ess, "spawnmob"); String[] args = new String[] { sign.getLine(2), sign.getLine(1) }; try { - command.run(ess.getServer(), player, "spawnmob", args); + command.run(player, args); } catch (Exception ex) { -- cgit v1.2.3 From 01a37df70070f50995e0314fc1af222b633af261 Mon Sep 17 00:00:00 2001 From: ementalo Date: Mon, 23 Jan 2012 16:00:23 +0000 Subject: Add new permission essentials.protect.alerts.notrigger If user has this permisson they do not trigger EssProtect block alerts Fix spawnmob sign command args --- EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java index 58383782b..4c6d1238a 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java @@ -37,7 +37,7 @@ public class SignSpawnmob extends EssentialsSign }; try { - command.run(player, args); + command.run(player, "spawnmob", args); } catch (Exception ex) { -- cgit v1.2.3 From 224e5f129eb4a18a46c063fc290a26abce247d9c Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:14:33 -0500 Subject: ChargeException was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane --- EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java index 4c6d1238a..8a96fe25f 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; -- cgit v1.2.3 From 90acb796f475356a9110af7ceb915efd80624de2 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Mar 2012 03:58:53 +0100 Subject: Trade is part of Economy --- EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java index 8a96fe25f..577cc7a6b 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignSpawnmob.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.Trade; +import com.earth2me.essentials.economy.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.commands.Commandspawnmob; -- cgit v1.2.3