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

Merge pull request #118 from Mineplex-LLC/develop 

Merge develop into project-cosmetics
This commit is contained in:
LCastr0 2016-06-28 18:13:09 -03:00 committed by GitHub
parent 30f413d04e fbd9b17ba0
commit 324a967135
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
View File

@ -1202,7 +1202,11 @@ public class UHC extends TeamGame
{
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);
}
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/ExperienceStatTracker.java
View File

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