From 133376fb9480bd7761f3d71c9f1d72fd6e50af5e Mon Sep 17 00:00:00 2001 From: TadahTech Date: Sat, 23 Jul 2016 19:50:57 -0500 Subject: [PATCH 1/4] Relocation of Full server check in party invites. Fixes a bug where people cannot invite players to their party, regardless of which server they are on, when the inivters server is full. --- .../core/party/manager/PartyMethodManager.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java index 0d70ce4b6..f25d984c9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java @@ -43,13 +43,6 @@ public class PartyMethodManager return; } - boolean can = Bukkit.getMaxPlayers() >= _plugin.getPlugin().getServer().getOnlinePlayers().size(); - if(!can) - { - Lang.SERVER_FULL.send(caller); - return; - } - if(party != null) { if(!party.getOwner().equalsIgnoreCase(caller.getName())) @@ -115,6 +108,14 @@ public class PartyMethodManager _plugin.getInviteManager().sendAcceptOrDeny(possible, caller.getName()); return; } + //Only perform this when I actually need too. + boolean can = Bukkit.getMaxPlayers() >= _plugin.getPlugin().getServer().getOnlinePlayers().size(); + if(!can) + { + Lang.SERVER_FULL.send(caller); + return; + } + //Not on the same server _plugin.getRedisManager().findAndInvite(target, caller.getName()); } From ceccf2d2acd621a675f717f10374b3d6b91433e3 Mon Sep 17 00:00:00 2001 From: TadahTech Date: Sat, 23 Jul 2016 22:36:53 -0500 Subject: [PATCH 2/4] Don't give the item when a game is in progress. --- .../src/mineplex/core/party/PartyEventListener.java | 2 -- .../mineplex/core/party/manager/PartyMethodManager.java | 2 +- Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 3 +++ .../nautilus/game/arcade/managers/GamePlayerManager.java | 7 ++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java index b0db2a619..06319bc04 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java @@ -36,8 +36,6 @@ public class PartyEventListener implements Listener { Player player = event.getPlayer(); - player.getInventory().setItem(PartyManager.INTERFACE_SLOT, PartyManager.INTERFACE_ITEM); - String partyName = _plugin.getInviteManager().getPartyWaiting(player.getUniqueId()); if (partyName == null) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java index f25d984c9..bc4955d44 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java @@ -108,7 +108,7 @@ public class PartyMethodManager _plugin.getInviteManager().sendAcceptOrDeny(possible, caller.getName()); return; } - //Only perform this when I actually need too. + //Only perform this when I actually need to. boolean can = Bukkit.getMaxPlayers() >= _plugin.getPlugin().getServer().getOnlinePlayers().size(); if(!can) { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index da590e9b6..92464dca5 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -515,6 +515,9 @@ public class HubManager extends MiniClientPlugin //Add Self to Other otherPlayer.getScoreboard().getTeam(rankName).addPlayer(player); } + + //only give it in the hub + player.getInventory().setItem(PartyManager.INTERFACE_SLOT, PartyManager.INTERFACE_ITEM); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java index cef0c62ab..86d41b5be 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java @@ -1,7 +1,5 @@ package nautilus.game.arcade.managers; -import java.util.ArrayList; - import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -9,6 +7,7 @@ import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilTabTitle; import mineplex.core.common.util.UtilTime; +import mineplex.core.party.PartyManager; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -23,7 +22,6 @@ import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.ProgressingKit; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -41,6 +39,8 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerRespawnEvent; import org.bukkit.scheduler.BukkitRunnable; +import java.util.ArrayList; + public class GamePlayerManager implements Listener { ArcadeManager Manager; @@ -154,6 +154,7 @@ public class GamePlayerManager implements Listener player.sendMessage(F.main("Kit", "No default kit found for " + C.cGreenB + Manager.GetGame().GetName())); } }.runTaskLater(Manager.getPlugin(), 10L); + player.getInventory().setItem(PartyManager.INTERFACE_SLOT, PartyManager.INTERFACE_ITEM); return; } From 5180e46be7231805d907723f40102a9dab18806e Mon Sep 17 00:00:00 2001 From: TadahTech Date: Sun, 24 Jul 2016 22:17:50 -0500 Subject: [PATCH 3/4] Revert party chat symbol to "@". Change team chat symbol to "#". --- .../src/mineplex/hub/HubManager.java | 2 +- .../game/arcade/game/games/draw/Draw.java | 82 +++++++++---------- .../arcade/game/games/typewars/TypeWars.java | 54 ++++++------ .../arcade/managers/GameCreationManager.java | 37 ++++----- .../arcade/managers/chat/GameChatManager.java | 4 +- 5 files changed, 86 insertions(+), 93 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 92464dca5..21752eafe 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -590,7 +590,7 @@ public class HubManager extends MiniClientPlugin if (rank != Rank.ALL) rankStr = rank.getTag(true, true) + " "; //Party Chat - if (event.getMessage().charAt(0) == '#') + if (event.getMessage().charAt(0) == '@') { Party party = _partyManager.getParty(player); if (party != null) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java index 8b6c61a77..728e12e57 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java @@ -1,13 +1,39 @@ package nautilus.game.arcade.game.games.draw; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; - +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilAlg; +import mineplex.core.common.util.UtilBlock; +import mineplex.core.common.util.UtilBlockText; +import mineplex.core.common.util.UtilBlockText.TextAlign; +import mineplex.core.common.util.UtilGear; +import mineplex.core.common.util.UtilInv; +import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilTextBottom; +import mineplex.core.common.util.UtilTime; +import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.recharge.Recharge; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.GameType; +import nautilus.game.arcade.events.GameStateChangeEvent; +import nautilus.game.arcade.game.GameTeam; +import nautilus.game.arcade.game.SoloGame; +import nautilus.game.arcade.game.games.GameScore; +import nautilus.game.arcade.game.games.draw.kits.KitArtist; +import nautilus.game.arcade.game.games.draw.tools.Tool; +import nautilus.game.arcade.game.games.draw.tools.ToolCircle; +import nautilus.game.arcade.game.games.draw.tools.ToolLine; +import nautilus.game.arcade.game.games.draw.tools.ToolSquare; +import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.managers.chat.ChatStatData; +import nautilus.game.arcade.stats.DrawGuessStatTracker; +import nautilus.game.arcade.stats.KeenEyeStatTracker; +import nautilus.game.arcade.stats.MrSquiggleStatTracker; +import nautilus.game.arcade.stats.PureLuckStatTracker; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; @@ -26,38 +52,13 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerQuitEvent; -import mineplex.core.common.util.C; -import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilAlg; -import mineplex.core.common.util.UtilBlock; - -import mineplex.core.common.util.UtilGear; -import mineplex.core.common.util.UtilInv; -import mineplex.core.common.util.UtilMath; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilServer; -import mineplex.core.common.util.UtilBlockText; -import mineplex.core.common.util.UtilTextBottom; -import mineplex.core.common.util.UtilTime; -import mineplex.core.common.util.UtilBlockText.TextAlign; -import mineplex.core.itemstack.ItemStackFactory; -import mineplex.core.recharge.Recharge; -import mineplex.core.updater.UpdateType; -import mineplex.core.updater.event.UpdateEvent; -import nautilus.game.arcade.ArcadeManager; -import nautilus.game.arcade.GameType; -import nautilus.game.arcade.events.GameStateChangeEvent; -import nautilus.game.arcade.game.GameTeam; -import nautilus.game.arcade.game.SoloGame; -import nautilus.game.arcade.game.games.GameScore; -import nautilus.game.arcade.game.games.draw.kits.*; -import nautilus.game.arcade.game.games.draw.tools.*; -import nautilus.game.arcade.kit.Kit; -import nautilus.game.arcade.managers.chat.ChatStatData; -import nautilus.game.arcade.stats.DrawGuessStatTracker; -import nautilus.game.arcade.stats.KeenEyeStatTracker; -import nautilus.game.arcade.stats.MrSquiggleStatTracker; -import nautilus.game.arcade.stats.PureLuckStatTracker; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; public class Draw extends SoloGame { @@ -211,7 +212,6 @@ public class Draw extends SoloGame new ChatStatData("PureLuck", "Lucky Guess'", true) ); - Manager.GetChat().setThreeSecondDelay(false); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java index fd5ad26b4..dcd4f94d2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java @@ -1,31 +1,5 @@ package nautilus.game.arcade.game.games.typewars; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; - -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Sound; -import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.Giant; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityDeathEvent; -import org.bukkit.event.entity.EntitySpawnEvent; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerChatEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.LeatherArmorMeta; -import org.bukkit.util.Vector; - import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -67,8 +41,32 @@ import nautilus.game.arcade.gametutorial.events.GameTutorialEndEvent; import nautilus.game.arcade.gametutorial.events.GameTutorialStartEvent; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.managers.chat.ChatStatData; -import nautilus.game.arcade.stats.TimeInGameStatTracker; import nautilus.game.arcade.world.WorldData; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.Giant; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityDeathEvent; +import org.bukkit.event.entity.EntitySpawnEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.PlayerChatEvent; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.LeatherArmorMeta; +import org.bukkit.util.Vector; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; public class TypeWars extends TeamGame { @@ -175,7 +173,6 @@ public class TypeWars extends TeamGame ); manager.GetCreature().SetDisableCustomDrops(true); - manager.GetChat().setThreeSecondDelay(false); } @EventHandler @@ -993,7 +990,6 @@ public class TypeWars extends TeamGame //End Manager.GetCreature().SetDisableCustomDrops(false); - Manager.GetChat().setThreeSecondDelay(true); SetState(GameState.End); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java index 9b47ccc27..181d5efc8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java @@ -1,24 +1,5 @@ package nautilus.game.arcade.managers; -import java.lang.reflect.Array; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.HandlerList; -import org.bukkit.event.Listener; - import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTime; @@ -33,6 +14,23 @@ import nautilus.game.arcade.GameType; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.stats.StatTracker; +import org.bukkit.ChatColor; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.HandlerList; +import org.bukkit.event.Listener; + +import java.lang.reflect.Array; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GameCreationManager implements Listener { @@ -175,7 +173,6 @@ public class GameCreationManager implements Listener // Manager.GetAntiStack().SetEnabled(true); Manager.getCosmeticManager().setHideParticles(false); Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName); - Manager.GetChat().setThreeSecondDelay(true); ItemStackFactory.Instance.SetUseCustomNames(false); HashMap pastTeams = null; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java index 996fc364c..368746c24 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java @@ -122,7 +122,7 @@ public class GameChatManager implements Listener } //Party Chat - if (event.getMessage().charAt(0) == '#') + if (event.getMessage().charAt(0) == '@') { Party party = _manager.getPartyManager().getParty(sender); if (party != null) @@ -186,7 +186,7 @@ public class GameChatManager implements Listener if (team != null) { - boolean isPriv = event.getMessage().charAt(0) == '@'; + boolean isPriv = event.getMessage().charAt(0) == '#'; if(isPriv) event.setMessage(event.getMessage().substring(1, event.getMessage().length())); From 0d46bc460905944cbb3290a7ef7ae007064ccadf Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 21 Jul 2016 06:28:32 -0500 Subject: [PATCH 4/4] Add Amplifier thank button --- .../core/boosters/command/BoosterCommand.java | 4 +- .../core/boosters/command/ThankCommand.java | 74 +++++++++++++++++++ .../core/boosters/tips/BoosterTipManager.java | 5 +- .../arcade/booster/GameBoosterManager.java | 12 ++- 4 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/BoosterCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/BoosterCommand.java index 216130e12..44a429ac6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/BoosterCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/BoosterCommand.java @@ -15,11 +15,12 @@ public class BoosterCommand extends MultiCommandBase { public BoosterCommand(BoosterManager plugin) { - super(plugin, Rank.DEVELOPER, "amplifier", "booster"); + super(plugin, Rank.ALL, "amplifier", "booster"); AddCommand(new AddCommand(plugin)); AddCommand(new GuiCommand(plugin)); AddCommand(new ReloadCommand(plugin)); + AddCommand(new ThankCommand(plugin)); } @Override @@ -27,5 +28,6 @@ public class BoosterCommand extends MultiCommandBase { UtilPlayer.message(caller, F.help("amplifier add ", "Add an amplifier to that group", Rank.DEVELOPER)); UtilPlayer.message(caller, F.help("amplifier gui", "Open Amplifier GUI", Rank.DEVELOPER)); + UtilPlayer.message(caller, F.help("amplifier thank ", "Thank an Amplifier for a specific Booster Group", Rank.ALL)); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java new file mode 100644 index 000000000..686fd9c58 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/command/ThankCommand.java @@ -0,0 +1,74 @@ +package mineplex.core.boosters.command; + +import mineplex.core.boosters.Booster; +import mineplex.core.boosters.BoosterManager; +import mineplex.core.boosters.tips.BoosterTipManager; +import mineplex.core.boosters.tips.TipAddResult; +import mineplex.core.command.CommandBase; +import mineplex.core.common.CurrencyType; +import mineplex.core.common.Rank; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import org.apache.commons.lang3.StringUtils; +import org.bukkit.Sound; +import org.bukkit.entity.Player; + +/** + * @author Shaun Bennett + */ +public class ThankCommand extends CommandBase +{ + public ThankCommand(BoosterManager plugin) + { + super(plugin, Rank.ALL, "thank"); + } + + @Override + public void Execute(Player caller, String[] args) + { + if (args == null || args.length == 0) + { + // try to thank the current amplifier group + String boosterGroup = Plugin.getBoosterGroup(); + if (boosterGroup == null || boosterGroup.length() <= 0) + { + UtilPlayer.message(caller, F.main("Amplifier", "You must specify an Amplifier Group")); + return; + } + + attemptToTipGroup(caller, boosterGroup); + } + else + { + String boosterGroup = StringUtils.join(args, ' '); + attemptToTipGroup(caller, boosterGroup); + } + } + + private void attemptToTipGroup(Player caller, String boosterGroup) + { + Booster booster = Plugin.getActiveBooster(boosterGroup); + if (booster == null) + { + // Give a friendly oops message + UtilPlayer.message(caller, F.main("Amplifier", "There was an error handling your request. Try again later")); + return; + } + else + { + Plugin.getTipManager().addTip(caller, booster, result -> + { + if (result == TipAddResult.SUCCESS) + { + UtilPlayer.message(caller, F.main("Tip", "You thanked " + F.name(booster.getPlayerName()) + ". They earned " + F.currency(CurrencyType.TREASURE_SHARD, BoosterTipManager.TIP_FOR_SPONSOR) + " and you got " + + F.currency(CurrencyType.TREASURE_SHARD, BoosterTipManager.TIP_FOR_TIPPER)) + " in return!"); + caller.playSound(caller.getLocation(), Sound.LEVEL_UP, 1f, 1f); + } + else if (result.getFriendlyMessage() != null) + { + UtilPlayer.message(caller, F.main("Amplifier", result.getFriendlyMessage())); + } + }); + } + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java index be7f28ca9..ff31ce07e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterTipManager.java @@ -4,6 +4,8 @@ import mineplex.core.MiniDbClientPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.boosters.Booster; import mineplex.core.common.util.Callback; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.donation.DonationManager; import mineplex.core.recharge.Recharge; import org.bukkit.entity.Player; @@ -33,8 +35,9 @@ public class BoosterTipManager extends MiniDbClientPlugin public void addTip(Player player, Booster booster, Callback callback) { - if (!Recharge.Instance.use(player, "Amplifier Thanks", 1000 * 60 * 10, true, false)) + if (!Recharge.Instance.use(player, "Amplifier Thanks", 1000 * 5, false, false)) { + UtilPlayer.message(player, F.main("Amplifier", "Please wait before trying that again")); callback.run(TipAddResult.ON_COOLDOWN); return; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java index 764fc09ef..7c88911ff 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/booster/GameBoosterManager.java @@ -8,9 +8,10 @@ import mineplex.core.boosters.event.BoosterExpireEvent; import mineplex.core.boosters.tips.BoosterTipManager; import mineplex.core.boosters.tips.TipAddResult; import mineplex.core.common.CurrencyType; -import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilWorld; +import mineplex.core.common.jsonchat.ClickEvent; +import mineplex.core.common.jsonchat.HoverEvent; +import mineplex.core.common.jsonchat.JsonMessage; +import mineplex.core.common.util.*; import mineplex.core.disguise.DisguiseManager; import mineplex.core.hologram.HologramManager; import mineplex.core.npc.NpcManager; @@ -86,5 +87,10 @@ public class GameBoosterManager extends MiniPlugin { Bukkit.broadcastMessage(F.main("Amplifier", F.name(booster.getPlayerName()) + " has activated a Game Amplifier on " + F.elem(event.getBoosterGroup().replaceAll("_", " ")) + "!")); } + + JsonMessage message = new JsonMessage(F.main("Amplifier", F.elem("Click here") + " to thank them and receive " + F.currency(CurrencyType.TREASURE_SHARD, BoosterTipManager.TIP_FOR_TIPPER) + "!")); + message.click(ClickEvent.RUN_COMMAND, "/amplifier thank " + _boosterGroup); + message.hover(HoverEvent.SHOW_TEXT, C.cGreen + "Click to Thank"); + message.send(JsonMessage.MessageType.CHAT_BOX, UtilServer.getPlayers()); } }