summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-02-28 03:15:21 +0000
committerKHobbits <rob@khobbits.co.uk>2013-02-28 03:15:21 +0000
commit120c14e72b7967fc692f5610d909d33d8e07ccdf (patch)
treee0e4bf3f21db2a1c2708ae6925d3cb9cc0c2ea0c
parent3525a7e20128243d18be028c064ecaa74e99b4a8 (diff)
downloadEssentials-120c14e72b7967fc692f5610d909d33d8e07ccdf.tar
Essentials-120c14e72b7967fc692f5610d909d33d8e07ccdf.tar.gz
Essentials-120c14e72b7967fc692f5610d909d33d8e07ccdf.tar.lz
Essentials-120c14e72b7967fc692f5610d909d33d8e07ccdf.tar.xz
Essentials-120c14e72b7967fc692f5610d909d33d8e07ccdf.zip
Add extra trade log messages for sign charges.
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignGameMode.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignHeal.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignInfo.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignKit.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignRepair.java9
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignTime.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignWarp.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignWeather.java2
9 files changed, 15 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java
index e3166db78..686e304f3 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java
@@ -46,6 +46,7 @@ public class SignGameMode extends EssentialsSign
performSetMode(mode.toLowerCase(Locale.ENGLISH), player);
player.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
+ Trade.log("Sign", "gameMode", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
charge.charge(player);
return true;
}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java b/Essentials/src/com/earth2me/essentials/signs/SignHeal.java
index be8b7ba1d..f29032163 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignHeal.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignHeal.java
@@ -31,6 +31,7 @@ public class SignHeal extends EssentialsSign
player.setFireTicks(0);
player.sendMessage(_("youAreHealed"));
charge.charge(player);
+ Trade.log("Sign", "Heal", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignInfo.java b/Essentials/src/com/earth2me/essentials/signs/SignInfo.java
index e75b060e3..fa79f9c63 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignInfo.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignInfo.java
@@ -49,6 +49,7 @@ public class SignInfo extends EssentialsSign
}
charge.charge(player);
+ Trade.log("Sign", "Info", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignKit.java b/Essentials/src/com/earth2me/essentials/signs/SignKit.java
index 6b856fc36..391b23407 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignKit.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignKit.java
@@ -63,6 +63,7 @@ public class SignKit extends EssentialsSign
final List<String> items = Kit.getItems(player, kit);
Kit.expandItems(ess, player, items);
charge.charge(player);
+ Trade.log("Sign", "Kit", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
}
catch (NoChargeException ex)
{
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignRepair.java b/Essentials/src/com/earth2me/essentials/signs/SignRepair.java
index 7e76309f1..f09d94536 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignRepair.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignRepair.java
@@ -23,11 +23,11 @@ public class SignRepair extends EssentialsSign
{
sign.setLine(1, "Hand");
}
- else if (!repairTarget.equalsIgnoreCase("all") && !repairTarget.equalsIgnoreCase("hand") )
+ else if (!repairTarget.equalsIgnoreCase("all") && !repairTarget.equalsIgnoreCase("hand"))
{
sign.setLine(1, "§c<hand|all>");
throw new SignException(_("invalidSignLine", 2));
- }
+ }
validateTrade(sign, 2, ess);
return true;
}
@@ -37,7 +37,7 @@ public class SignRepair extends EssentialsSign
{
final Trade charge = getTrade(sign, 2, ess);
charge.isAffordableFor(player);
-
+
Commandrepair command = new Commandrepair();
command.setEssentials(ess);
String[] args = new String[]
@@ -52,7 +52,8 @@ public class SignRepair extends EssentialsSign
{
throw new SignException(ex.getMessage(), ex);
}
- charge.charge(player);
+ charge.charge(player);
+ Trade.log("Sign", "Repair", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java b/Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java
index 41fb05ecd..44979a7f1 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignSpawnmob.java
@@ -39,6 +39,7 @@ public class SignSpawnmob extends EssentialsSign
}
charge.charge(player);
+ Trade.log("Sign", "Spawnmob", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
}
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTime.java b/Essentials/src/com/earth2me/essentials/signs/SignTime.java
index 99c579ff4..c618133c3 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignTime.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignTime.java
@@ -44,12 +44,14 @@ public class SignTime extends EssentialsSign
{
player.getWorld().setTime(time + 24000);
charge.charge(player);
+ Trade.log("Sign", "TimeDay", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
if ("§2Night".equalsIgnoreCase(timeString))
{
player.getWorld().setTime(time + 37700);
charge.charge(player);
+ Trade.log("Sign", "TimeNight", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
throw new SignException(_("onlyDayNight"));
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java b/Essentials/src/com/earth2me/essentials/signs/SignWarp.java
index eb81ea4e1..ef52ceb60 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignWarp.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignWarp.java
@@ -59,6 +59,7 @@ public class SignWarp extends EssentialsSign
try
{
player.getTeleport().warp(warpName, charge, TeleportCause.PLUGIN);
+ Trade.log("Sign", "Warp", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
}
catch (Exception ex)
{
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignWeather.java b/Essentials/src/com/earth2me/essentials/signs/SignWeather.java
index 9be677143..527e9fcf8 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignWeather.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignWeather.java
@@ -43,12 +43,14 @@ public class SignWeather extends EssentialsSign
{
player.getWorld().setStorm(false);
charge.charge(player);
+ Trade.log("Sign", "WeatherSun", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
if ("§2Storm".equalsIgnoreCase(weatherString))
{
player.getWorld().setStorm(true);
charge.charge(player);
+ Trade.log("Sign", "WeatherStorm", "Interact", username, null, username, charge, sign.getBlock().getLocation(), ess);
return true;
}
throw new SignException(_("onlySunStorm"));