From d48c342e37f83c1dd8de06c59e2de62384739f95 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Thu, 23 May 2013 22:09:28 +0100
Subject: [PATCH] Fixing feed messages.

---
 .../com/earth2me/essentials/commands/Commandfeed.java  | 10 ++++++++--
 Essentials/src/messages.properties                     |  6 +++---
 Essentials/src/messages_en.properties                  |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
index 73cce659e..feb148893 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
@@ -45,6 +45,8 @@ public class Commandfeed extends EssentialsCommand
 		{
 			//User does not need feeding.
 		}
+
+		user.sendMessage(_("feed"));
 	}
 
 	@Override
@@ -96,9 +98,13 @@ public class Commandfeed extends EssentialsCommand
 		{
 			throw new QuietAbortException();
 		}
-		
+
 		player.setFoodLevel(flce.getFoodLevel() > 20 ? 20 : flce.getFoodLevel());
 		player.setSaturation(10);
-		sender.sendMessage(sender.equals(player) ? _("feed") : _("feedOther", player.getDisplayName()));
+
+		if (!sender.equals(player))
+		{
+			sender.sendMessage(_("feedOther", player.getDisplayName()));
+		}
 	}
 }
diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties
index 80a703568..3efc691ec 100644
--- a/Essentials/src/messages.properties
+++ b/Essentials/src/messages.properties
@@ -115,7 +115,7 @@ failedToCreateConfig=Failed to create config {0}.
 failedToWriteConfig=Failed to write config {0}.
 false=\u00a74false\u00a7r
 feed=\u00a76Your appetite was sated.
-feedOther=\u00a76Satisfied {0}\u00a76.
+feedOther=\u00a76You satiated the appetite of {0}\u00a76.
 fileRenameError=Renaming file {0} failed!
 fireworkColor=\u00a74Invalid firework charge parameters inserted, must set a color first.
 fireworkEffectsCleared=\u00a76Removed all effects from held stack.
@@ -455,8 +455,8 @@ tempBanned=Temporarily banned from server for {0}.
 tempbanExempt=\u00a74You may not tempban that player.
 thunder= \u00a76You\u00a7c {0} \u00a76thunder in your world.
 thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
-timeBeforeHeal=\u00a76Time before next heal:\u00a7c {0}\u00a76.
-timeBeforeTeleport=\u00a76Time before next teleport:\u00a7c {0}
+timeBeforeHeal=\u00a74Time before next heal:\u00a7c {0}\u00a76.
+timeBeforeTeleport=\u00a74Time before next teleport:\u00a7c {0}\u00a76.
 timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\u00a76.
 timePattern=(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
 timeSet=\u00a76Time set in all worlds.
diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties
index 80a703568..3efc691ec 100644
--- a/Essentials/src/messages_en.properties
+++ b/Essentials/src/messages_en.properties
@@ -115,7 +115,7 @@ failedToCreateConfig=Failed to create config {0}.
 failedToWriteConfig=Failed to write config {0}.
 false=\u00a74false\u00a7r
 feed=\u00a76Your appetite was sated.
-feedOther=\u00a76Satisfied {0}\u00a76.
+feedOther=\u00a76You satiated the appetite of {0}\u00a76.
 fileRenameError=Renaming file {0} failed!
 fireworkColor=\u00a74Invalid firework charge parameters inserted, must set a color first.
 fireworkEffectsCleared=\u00a76Removed all effects from held stack.
@@ -455,8 +455,8 @@ tempBanned=Temporarily banned from server for {0}.
 tempbanExempt=\u00a74You may not tempban that player.
 thunder= \u00a76You\u00a7c {0} \u00a76thunder in your world.
 thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
-timeBeforeHeal=\u00a76Time before next heal:\u00a7c {0}\u00a76.
-timeBeforeTeleport=\u00a76Time before next teleport:\u00a7c {0}
+timeBeforeHeal=\u00a74Time before next heal:\u00a7c {0}\u00a76.
+timeBeforeTeleport=\u00a74Time before next teleport:\u00a7c {0}\u00a76.
 timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\u00a76.
 timePattern=(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?
 timeSet=\u00a76Time set in all worlds.