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

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

Browse Source
This commit is contained in:
Sam 2016-09-27 19:02:56 +01:00
commit 78e6f3bf71
6 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
View File

@ -113,8 +113,19 @@ public class AccountRepository extends MinecraftRepository
for (ILoginProcessor loginProcessor : loginProcessors)
{
loginProcessor.processLoginResultSet(name, uuid, finalId, statement.getResultSet());
statement.getMoreResults();
try
{
loginProcessor.processLoginResultSet(name, uuid, finalId, statement.getResultSet());
}
catch (Throwable t)
{
System.out.println("Error: ILoginProcessor raised an exception");
t.printStackTrace(System.out);
}
finally
{
statement.getMoreResults();
}
}
}

8
Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java
View File

@ -300,6 +300,10 @@ public class PlayerDisguiseManager extends MiniPlugin implements IPacketHandler
{
Player player = Bukkit.getPlayerExact(data.a().getName());
// Would be null during login, we don't care
// LoginListener -> PlayerList#a(NetworkManager, EntityPlayer)
// -> PlayerList#a(EntityPlayer, EntityPlayer, WorldServer) (Sends this packet)
// -> PlayerList#onPlayerJoin(EntityPlayer, String) (Populates Bukkit.getPlayerExact)
if (player != null)
{
if (isDisguised(player))
@ -313,10 +317,6 @@ public class PlayerDisguiseManager extends MiniPlugin implements IPacketHandler
((CraftPlayer) player).getHandle().playerConnection.networkManager.handle(custom);
}
}
else
{
System.out.println("Null player while sending PlayerInfoData: " + data.a().getName());
}
}
}
}

4
Plugins/Mineplex.Core/src/mineplex/core/mavericks/MavericksApprovedRepository.java
View File

@ -92,9 +92,9 @@ public class MavericksApprovedRepository
long approvedDate = set.getLong(2);
UUID approvedBy = UUID.fromString(set.getString(3));
boolean display = set.getBoolean(4);
Timestamp stamp = set.getTimestamp(1);
Timestamp stamp = set.getTimestamp(5);
Long firstDisplayed = null;
if(!set.wasNull() && stamp != null) stamp.getTime();
if(!set.wasNull() && stamp != null) firstDisplayed = stamp.getTime();
String theme = set.getString(6);

2
Plugins/Mineplex.Core/src/mineplex/core/playwire/PlayWireManager.java
View File

@ -39,7 +39,7 @@ public class PlayWireManager extends MiniDbClientPlugin<PlayWireClientData>
@Override
public String getQuery(int accountId, String uuid, String name)
{
return "SELECT `redeemed` FROM `play_wire` WHERE `accountId`=" + accountId + ";";
return "SELECT `redeemed`, `streak` FROM `play_wire` WHERE `accountId`=" + accountId + ";";
}
public boolean canRedeem(Player player)

17
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerInfo.java
View File

@ -14,7 +14,7 @@ public class ServerInfo
public String Game;
public Rank HostRank = Rank.ALL;
public MinecraftServer Server;
public int getAvailableSlots()
{
return MaxPlayers - CurrentPlayers;
@ -22,6 +22,19 @@ public class ServerInfo
public boolean isDevServer()
{
return Name.contains("-Dev-");
try
{
int index = Name.lastIndexOf('-');
if (index != -1)
{
int id = Integer.parseInt(Name.substring(index + 1));
return id >= 777;
}
}
catch (NumberFormatException ex)
{
return false;
}
return false;
}
}

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -437,11 +437,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
_gameLobbyManager.AddPlayerToScoreboards(onlinePlayer, gameTeam);
}
System.out.println("Handling player join " + playerName + " " + player.getName() + " " + GetGame());
if (GetGame() != null)
{
System.out.println(GetGame().IsAlive(player));
if (GetGame().IsAlive(player))
{
GetGame().GetScoreboard().setPlayerTeam(player, GetGame().GetTeam(player));