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

fixes

Browse Source
This commit is contained in:
Mini-Chiss 2015-08-28 20:31:29 -07:00
parent 5777309d18
commit 88ca205474
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
View File

@ -403,7 +403,7 @@ public class Evolution extends SoloGame
}
}
@EventHandler
@EventHandler(priority = EventPriority.MONITOR)
public void onKill(CombatDeathEvent event)
{
event.SetBroadcastType(DeathMessageType.Simple);
@ -790,10 +790,4 @@ public class Evolution extends SoloGame
Scoreboard.Draw();
}
@EventHandler
public void deathMsg(CombatDeathEvent event)
{
event.SetBroadcastType(DeathMessageType.Simple);
}
}

21
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
View File

@ -190,13 +190,13 @@ public class GameGemManager implements Listener
//Time Reward
if (TimeReward)
{
long timeOnline = 7380000;
long timeOnline = 7980000;
double hoursOnline = timeOnline/3600000d;
if (hoursOnline > 5)
hoursOnline = 5;
hoursOnline = 5;
total += (int)(earned * (hoursOnline * 0.2));
}
@ -308,19 +308,22 @@ public class GameGemManager implements Listener
//Time Reward
if (TimeReward)
{
long timeOnline = 7380000;
long timeOnline = 7980000;
double hoursOnline = timeOnline/3600000d;
if (hoursOnline > 5)
hoursOnline = 5;
int extraGems = (int)(earnedGems * (hoursOnline * 0.2));;
int extraGems = (int)(earnedGems * (hoursOnline * 0.2));
UtilPlayer.message(player, F.elem(C.cGreen + "+" + extraGems + " Gems") + " for " +
F.elem("Online for " + UtilTime.MakeStr(timeOnline) ));
totalGems += extraGems;
if (extraGems > 0)
{
UtilPlayer.message(player, F.elem(C.cGreen + "+" + extraGems + " Gems") + " for " +
F.elem("Online for " + UtilTime.MakeStr(timeOnline) + C.cGreen + " +" + (int)(hoursOnline * 20) + "%"));
totalGems += extraGems;
}
}
//Double Gem