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

No longer send the invalid kit message if kit is null

Browse Source
This commit is contained in:
Sam 2018-02-28 14:17:46 +00:00 committed by Alexander Meech
parent 60a468d03d
commit a1b272b5a4
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1103,7 +1103,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed
return; return;
} }
setFirstKit(player, team); setFirstKit(player, team, true);
} }
else else
{ {
@ -1125,13 +1125,17 @@ public abstract class Game extends ListenerComponent implements Lifetimed
} }
} }
setFirstKit(player, team); setFirstKit(player, team, false);
} }
} }
private void setFirstKit(Player player, GameTeam team) private void setFirstKit(Player player, GameTeam team, boolean inform)
{ {
player.sendMessage(F.main("Kit", "Your current kit is not applicable with your team. Please select a different kit")); if (inform)
{
player.sendMessage(F.main("Kit", "Your current kit is not applicable with your team. Please select a different kit."));
}
Arrays.stream(_kits).filter(team::KitAllowed).findFirst().ifPresent(kit1 -> SetKit(player, kit1, false)); Arrays.stream(_kits).filter(team::KitAllowed).findFirst().ifPresent(kit1 -> SetKit(player, kit1, false));
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/kits/perk/PerkLifeSteal.java
View File

@ -30,7 +30,7 @@ public class PerkLifeSteal extends Perk
if (killer != null && hasPerk(killer)) if (killer != null && hasPerk(killer))
{ {
CakeWars game = (CakeWars) Manager.GetGame(); CakeWars game = (CakeWars) Manager.GetGame();
double increase = Math.max(0, _increase - game.getDeathsInLastMinute(player)); double increase = Math.max(0, _increase - game.getDeathsInLastMinute(player) * 2);
UtilPlayer.health(killer, increase); UtilPlayer.health(killer, increase);
} }