Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

This commit is contained in:
libraryaddict 2015-05-14 14:29:43 +12:00
commit 67f1e4ad1f
2 changed files with 2 additions and 4 deletions

View File

@ -523,8 +523,6 @@ public class HubManager extends MiniClientPlugin<HubClient>
else
{
event.setJoinMessage(C.cGreen + C.Bold + "Legend " + playerName + " has joined!");
UtilFirework.playFirework(player.getEyeLocation(), org.bukkit.FireworkEffect.Type.BALL_LARGE, Color.LIME, true, true);
player.getWorld().playSound(player.getEyeLocation(), Sound.WITHER_SPAWN, 2f, 1f);
}
//Teleport

View File

@ -54,10 +54,10 @@ public class ExperienceStatTracker extends StatTracker<Game>
gemExp += (int)gem.Gems;
}
gemExp = Math.min(gemExp, 250) * 3;
gemExp = Math.min(gemExp, 250) * 5;
//Game Time = 1 Exp per 3 Seconds
double timeExp = (System.currentTimeMillis() - _startTime)/2000d;
double timeExp = (System.currentTimeMillis() - _startTime)/1500d;
//Mult
double mult = 1;