From 8baedd173a680bffd63c1764a6edf291876d26ae Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 10 Feb 2013 00:07:40 +0000 Subject: Fix kit messages when giving kit to another player. --- Essentials/src/com/earth2me/essentials/commands/Commandkit.java | 6 ++++-- Essentials/src/messages.properties | 2 ++ Essentials/src/messages_cs.properties | 2 ++ Essentials/src/messages_da.properties | 2 ++ Essentials/src/messages_de.properties | 2 ++ Essentials/src/messages_en.properties | 2 ++ Essentials/src/messages_es.properties | 2 ++ Essentials/src/messages_fi.properties | 2 ++ Essentials/src/messages_fr.properties | 2 ++ Essentials/src/messages_it.properties | 2 ++ Essentials/src/messages_nl.properties | 2 ++ Essentials/src/messages_pl.properties | 2 ++ Essentials/src/messages_pt.properties | 2 ++ Essentials/src/messages_se.properties | 2 ++ 14 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java index e3a7de160..aa5cf7302 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java @@ -59,7 +59,8 @@ public class Commandkit extends EssentialsCommand final List items = Kit.getItems(userTo, kit); Kit.expandItems(ess, userTo, items); - sender.sendMessage(_("kitGive", kitName)); + sender.sendMessage(_("kitGiveTo", kitName, userTo.getDisplayName())); + userTo.sendMessage(_("kitReceive", kitName)); } } @@ -87,6 +88,7 @@ public class Commandkit extends EssentialsCommand Kit.expandItems(ess, userTo, items); charge.charge(userFrom); - userTo.sendMessage(_("kitGive", kitName)); + userFrom.sendMessage(_("kitGiveTo", kitName, userTo.getDisplayName())); + userTo.sendMessage(_("kitReceive", kitName)); } } diff --git a/Essentials/src/messages.properties b/Essentials/src/messages.properties index df507d1e5..f4c7d4bee 100644 --- a/Essentials/src/messages.properties +++ b/Essentials/src/messages.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond. fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle. bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_cs.properties b/Essentials/src/messages_cs.properties index 136dbbcd6..ca96dca42 100644 --- a/Essentials/src/messages_cs.properties +++ b/Essentials/src/messages_cs.properties @@ -500,3 +500,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_da.properties b/Essentials/src/messages_da.properties index c85e02edf..007c4dd7e 100644 --- a/Essentials/src/messages_da.properties +++ b/Essentials/src/messages_da.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_de.properties b/Essentials/src/messages_de.properties index a664db0ba..63cc7ffd6 100644 --- a/Essentials/src/messages_de.properties +++ b/Essentials/src/messages_de.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_en.properties b/Essentials/src/messages_en.properties index df507d1e5..f4c7d4bee 100644 --- a/Essentials/src/messages_en.properties +++ b/Essentials/src/messages_en.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond. fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle. bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_es.properties b/Essentials/src/messages_es.properties index e0ce7dde1..49d4e63bc 100644 --- a/Essentials/src/messages_es.properties +++ b/Essentials/src/messages_es.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_fi.properties b/Essentials/src/messages_fi.properties index 09b008bf5..4f4fbe975 100644 --- a/Essentials/src/messages_fi.properties +++ b/Essentials/src/messages_fi.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties index 2b9de10c7..bb72f2e92 100644 --- a/Essentials/src/messages_fr.properties +++ b/Essentials/src/messages_fr.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_it.properties b/Essentials/src/messages_it.properties index 94cd6c0b8..58cdb3e28 100644 --- a/Essentials/src/messages_it.properties +++ b/Essentials/src/messages_it.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index f03225e8c..fdeb62a53 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_pl.properties b/Essentials/src/messages_pl.properties index ffcdb8fd3..4ead2ca83 100644 --- a/Essentials/src/messages_pl.properties +++ b/Essentials/src/messages_pl.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_pt.properties b/Essentials/src/messages_pt.properties index 2caf8dcde..5cc781d93 100644 --- a/Essentials/src/messages_pt.properties +++ b/Essentials/src/messages_pt.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75is currently AFK and may not respond fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. diff --git a/Essentials/src/messages_se.properties b/Essentials/src/messages_se.properties index 393342966..b9ca73d7e 100644 --- a/Essentials/src/messages_se.properties +++ b/Essentials/src/messages_se.properties @@ -497,3 +497,5 @@ userAFK=\u00a75{0} \u00a75\u00c3\u00a4r f\u00c3\u00b6r n\u00c3\u00a4rvarande bor fireworkEffectsCleared=\u00a76Removed all effects from held stack. fireworkSyntax=\u00a76Firework parameters:\u00a7c color: [fade:] [shape:] [effect:]\n\u00a76To use multiple colors/effects, seperate values with commas: \u00a7cred,blue,pink\n\u00a76Shapes:\u00a7c star, ball, large, creeper, burst \u00a76Effects:\u00a7c trail, twinkle bed=\u00a7obed\u00a7r +kitGiveTo=\u00a76Giving kit\u00a7c {0}\u00a76 to {1}\u00a7. +kitReceive=\u00a76Received kit\u00a7c {0}\u00a76. -- cgit v1.2.3