JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust some text wording

Browse Source
This commit is contained in:
Shaun Bennett 2016-08-03 14:55:33 -05:00
parent 2e80838376
commit ad6c1dd970
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plugins/Mineplex.Core/src/mineplex/core/thank/command/ThankCommand.java
View File

@ -2,11 +2,13 @@ package mineplex.core.thank.command;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.currency.GlobalCurrency;
import mineplex.core.common.util.Callback;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.thank.ThankManager;
import mineplex.core.thank.ThankResult;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
/**
@ -40,13 +42,13 @@ public class ThankCommand extends CommandBase<ThankManager>
switch (result)
{
case SUCCESS:
message = "You thanked " + F.name(playerName) + "!";
message = "You thanked " + F.name(playerName) + " and earned " + F.currency(GlobalCurrency.TREASURE_SHARD, ThankManager.DEFAULT_SENDER_REWARD) + "!";
break;
case CANNOT_THANK_SELF:
message = "You cannot thank yourself!";
break;
case COOLDOWN_DATABASE:
message = "/thank is on cooldown. Try again later";
message = "You can only /thank once per day!";
break;
case COOLDOWN_RECHARGE:
message = null;
@ -59,6 +61,13 @@ public class ThankCommand extends CommandBase<ThankManager>
{
UtilPlayer.message(caller, F.main("Thank", message));
}
if (result == ThankResult.SUCCESS && player.isOnline())
{
UtilPlayer.message(player, F.main("Thank", F.name(caller.getName()) + " used " + F.elem("/thank") + " on you! +" + F.currency(GlobalCurrency.TREASURE_SHARD, ThankManager.DEFAULT_RECEIVER_REWARD) + "!"));
UtilPlayer.message(player, F.main("Thank", "You can claim your reward at " + F.name("Carl the Creeper")));
player.playSound(player.getEyeLocation(), Sound.LEVEL_UP, 1f, 1.2f);
}
});
}
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java
View File

@ -93,7 +93,7 @@ public class GameBoosterManager extends MiniPlugin
if (event.getBoosterGroup().equals(_boosterGroup) || !isTesting)
{
JsonMessage message = new JsonMessage(F.main("Amplifier", F.elem("Click here") + " to thank them and receive " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterThankManager.TIP_FOR_TIPPER) + "!"));
JsonMessage message = new JsonMessage(F.main("Amplifier", F.elem("Click here") + " to thank them and get " + F.currency(GlobalCurrency.TREASURE_SHARD, BoosterThankManager.TIP_FOR_TIPPER) + "!"));
message.click(ClickEvent.RUN_COMMAND, "/amplifier thank " + event.getBoosterGroup());
message.hover(HoverEvent.SHOW_TEXT, C.cGreen + "Click to Thank");
message.send(JsonMessage.MessageType.CHAT_BOX, UtilServer.getPlayers());