Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2

This commit is contained in:
Keir Nellyer 2016-06-26 23:00:19 +01:00
commit dbf0bf35b4
2 changed files with 6 additions and 2 deletions

View File

@ -1202,7 +1202,11 @@ public class UHC extends TeamGame
{ {
for (Player player : teamsAlive.get(0).GetPlayers(false)) for (Player player : teamsAlive.get(0).GetPlayers(false))
{ {
int gems = Math.round((System.currentTimeMillis() - getPlayerIngameTime(player))/1000); long ingameTime = getPlayerIngameTime(player);
if (ingameTime == 0)
ingameTime = GetStateTime();
int gems = Math.round((System.currentTimeMillis() - ingameTime)/1000);
AddGems(player, gems, "Winning Team", false, false); AddGems(player, gems, "Winning Team", false, false);
} }
} }

View File

@ -72,7 +72,7 @@ public class ExperienceStatTracker extends StatTracker<Game>
//Game Time = 1 Exp per 3 Seconds //Game Time = 1 Exp per 3 Seconds
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
long playerJoin = getGame().getPlayerIngameTime(player); long playerJoin = getGame().getPlayerIngameTime(player);
if (playerJoin == 0) if (playerJoin == 0)
playerJoin = _startTime; playerJoin = _startTime;