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

Fix stupid JOOQ issue and IntelliJ.

This commit is contained in:
TadahTech 2016-07-21 03:46:18 -05:00
parent b734dc4e87
commit b48f97fd2e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java
View File

@ -15,7 +15,7 @@ public enum Lang
SUCCESS_SERVER_CONNECT("Sending you and your party to {0}..."), SUCCESS_SERVER_CONNECT("Sending you and your party to {0}..."),
INVITE_SUCCESS_PLAYER("Successfully invited {0} to the party."), INVITE_SUCCESS_PLAYER("Successfully invited {0} to the party."),
SUCCESS_INVITE("{0} has invited {1} to the party."), SUCCESS_INVITE("{0} has invited {1} to the party."),
INVITE_RECEIVED("You have been invited to {0}'s party! You have 60 seconds to reply."), INVITE_RECEIVED("You have been invited to {0}''s party! You have 60 seconds to reply."),
INVITE_ACCEPT("{0} has joined the party."), INVITE_ACCEPT("{0} has joined the party."),
INVITE_DENY("{0} declined your invite."), INVITE_DENY("{0} declined your invite."),
INVITE_EXPIRED("{0} did not respond in time."), INVITE_EXPIRED("{0} did not respond in time."),

13
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java
View File

@ -11,7 +11,6 @@ import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.GameTeam;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -21,11 +20,11 @@ import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.jooq.tools.json.JSONObject; import org.jooq.tools.json.JSONObject;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.*; import java.util.AbstractMap;
import java.util.stream.Collectors; import java.util.Collection;
import java.util.Iterator;
import static mineplex.database.routines.Test.playerName; import java.util.LinkedList;
import static sun.audio.AudioPlayer.player; import java.util.Map;
public class GameChatManager implements Listener public class GameChatManager implements Listener
{ {
@ -131,7 +130,7 @@ public class GameChatManager implements Listener
event.getRecipients().clear(); event.getRecipients().clear();
event.setMessage(event.getMessage().substring(1, event.getMessage().length())); event.setMessage(event.getMessage().substring(1, event.getMessage().length()));
event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + playerName + " " + C.cPurple + "%2$s"); event.setFormat(levelStr + C.cDPurple + C.Bold + "Party " + C.cWhite + C.Bold + event.getPlayer().getName() + " " + C.cPurple + "%2$s");
for (String member : party.getMembers()) for (String member : party.getMembers())
{ {