TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-06 20:43:11 +00:00
Code Issues Projects Releases Wiki Activity

Fixing feed messages.

Browse source
This commit is contained in:
KHobbits 2013-05-23 22:09:28 +01:00
parent 5c05870490
commit d48c342e37
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
View file

@ -45,6 +45,8 @@ public class Commandfeed extends EssentialsCommand
{ {
//User does not need feeding. //User does not need feeding.
} }
user.sendMessage(_("feed"));
} }
@Override @Override
@ -96,9 +98,13 @@ public class Commandfeed extends EssentialsCommand
{ {
throw new QuietAbortException(); throw new QuietAbortException();
} }
player.setFoodLevel(flce.getFoodLevel() > 20 ? 20 : flce.getFoodLevel()); player.setFoodLevel(flce.getFoodLevel() > 20 ? 20 : flce.getFoodLevel());
player.setSaturation(10); player.setSaturation(10);
sender.sendMessage(sender.equals(player) ? _("feed") : _("feedOther", player.getDisplayName()));
if (!sender.equals(player))
{
sender.sendMessage(_("feedOther", player.getDisplayName()));
}
} }
} }

6
Essentials/src/messages.properties
View file

@ -115,7 +115,7 @@ failedToCreateConfig=Failed to create config {0}.
failedToWriteConfig=Failed to write config {0}. failedToWriteConfig=Failed to write config {0}.
false=\u00a74false\u00a7r false=\u00a74false\u00a7r
feed=\u00a76Your appetite was sated. feed=\u00a76Your appetite was sated.
feedOther=\u00a76Satisfied {0}\u00a76. feedOther=\u00a76You satiated the appetite of {0}\u00a76.
fileRenameError=Renaming file {0} failed! fileRenameError=Renaming file {0} failed!
fireworkColor=\u00a74Invalid firework charge parameters inserted, must set a color first. fireworkColor=\u00a74Invalid firework charge parameters inserted, must set a color first.
fireworkEffectsCleared=\u00a76Removed all effects from held stack. 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. tempbanExempt=\u00a74You may not tempban that player.
thunder= \u00a76You\u00a7c {0} \u00a76thunder in your world. thunder= \u00a76You\u00a7c {0} \u00a76thunder in your world.
thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds. thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
timeBeforeHeal=\u00a76Time before next heal:\u00a7c {0}\u00a76. timeBeforeHeal=\u00a74Time before next heal:\u00a7c {0}\u00a76.
timeBeforeTeleport=\u00a76Time before next teleport:\u00a7c {0} timeBeforeTeleport=\u00a74Time before next teleport:\u00a7c {0}\u00a76.
timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\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]*)?)? 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. timeSet=\u00a76Time set in all worlds.

6
Essentials/src/messages_en.properties
View file

@ -115,7 +115,7 @@ failedToCreateConfig=Failed to create config {0}.
failedToWriteConfig=Failed to write config {0}. failedToWriteConfig=Failed to write config {0}.
false=\u00a74false\u00a7r false=\u00a74false\u00a7r
feed=\u00a76Your appetite was sated. feed=\u00a76Your appetite was sated.
feedOther=\u00a76Satisfied {0}\u00a76. feedOther=\u00a76You satiated the appetite of {0}\u00a76.
fileRenameError=Renaming file {0} failed! fileRenameError=Renaming file {0} failed!
fireworkColor=\u00a74Invalid firework charge parameters inserted, must set a color first. fireworkColor=\u00a74Invalid firework charge parameters inserted, must set a color first.
fireworkEffectsCleared=\u00a76Removed all effects from held stack. 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. tempbanExempt=\u00a74You may not tempban that player.
thunder= \u00a76You\u00a7c {0} \u00a76thunder in your world. thunder= \u00a76You\u00a7c {0} \u00a76thunder in your world.
thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds. thunderDuration=\u00a76You\u00a7c {0} \u00a76thunder in your world for\u00a7c {1} \u00a76seconds.
timeBeforeHeal=\u00a76Time before next heal:\u00a7c {0}\u00a76. timeBeforeHeal=\u00a74Time before next heal:\u00a7c {0}\u00a76.
timeBeforeTeleport=\u00a76Time before next teleport:\u00a7c {0} timeBeforeTeleport=\u00a74Time before next teleport:\u00a7c {0}\u00a76.
timeFormat=\u00a7c{0}\u00a76 or \u00a7c{1}\u00a76 or \u00a7c{2}\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]*)?)? 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. timeSet=\u00a76Time set in all worlds.