Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised

Plugins/Mineplex.Core/src/mineplex/core/boosters/command/BoosterCommand.java

@@ -15,11 +15,12 @@ public class BoosterCommand extends MultiCommandBase<BoosterManager>
 {
 	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<BoosterManager>
 	{
 		UtilPlayer.message(caller, F.help("amplifier add <group>", "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 <group>", "Thank an Amplifier for a specific Booster Group", Rank.ALL));
 	}
 }

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<BoosterManager>
+{
+	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()));
+				}
+			});
+		}
+	}
+}

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<PlayerTipData>
 
 	public void addTip(Player player, Booster booster, Callback<TipAddResult> 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;
 		}

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)

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 to.
+		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());
 	}

Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java

@@ -515,6 +515,9 @@ public class HubManager extends MiniClientPlugin<HubClient>
 			//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
@@ -587,7 +590,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
 		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)

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.jsonchat.ClickEvent;
-import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.jsonchat.HoverEvent;
-import mineplex.core.common.util.UtilWorld;
+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());
 	}
 }

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 mineplex.core.common.util.C;
-import java.util.Arrays;
+import mineplex.core.common.util.F;
-import java.util.Collection;
+import mineplex.core.common.util.UtilAlg;
-import java.util.Collections;
+import mineplex.core.common.util.UtilBlock;
-import java.util.HashSet;
+import mineplex.core.common.util.UtilBlockText;
-import java.util.Iterator;
+import mineplex.core.common.util.UtilBlockText.TextAlign;
-import java.util.List;
+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 java.util.ArrayList;
-import mineplex.core.common.util.F;
+import java.util.Arrays;
-import mineplex.core.common.util.UtilAlg;
+import java.util.Collection;
-import mineplex.core.common.util.UtilBlock;
+import java.util.Collections;
-
+import java.util.HashSet;
-import mineplex.core.common.util.UtilGear;
+import java.util.Iterator;
-import mineplex.core.common.util.UtilInv;
+import java.util.List;
-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;
 
 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

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);
 	}
 	

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<String, ChatColor> pastTeams = null;

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;
 		}
 

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()));