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

Fix Pumpkin's Revenge crashing on startup

Browse Source
This commit is contained in:
Sam 2017-10-13 17:11:43 +01:00
parent 23118d64a1
commit cf07417b1f
2 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
View File

@ -653,6 +653,11 @@ public class Halloween extends SoloGame
public void playSound(NamedAudio audio)
{
if (!doVoices)
{
return;
}
for (Player player : UtilServer.getPlayers())
if (!_soundOff.contains(player))
{

108
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween2016/Halloween2016.java
View File

@ -126,11 +126,11 @@ public class Halloween2016 extends Halloween
doVoices = false;
new CompassModule()
.setGiveCompass(true)
.setGiveCompassToSpecs(true)
.setGiveCompassToAlive(false)
.register(this);
// new CompassModule()
// .setGiveCompass(true)
// .setGiveCompassToSpecs(true)
// .setGiveCompassToAlive(false)
// .register(this);
}
public void setObjective(String objective)
@ -667,56 +667,56 @@ public class Halloween2016 extends Halloween
GetTeamList().add(new GameTeam(this, "Pumpkin Prince", ChatColor.RED, WorldData.GetDataLocs("RED")));
}
@Override
public void EndCheck()
{
if (!IsLive())
return;
if (_wave >= _waves.size())
{
for (Player player : GetPlayers(false))
{
Manager.GetGame().AddGems(player, 30, "Killing the Pumpkin Prince", false, false);
Manager.GetGame().AddGems(player, 10, "Participation", false, false);
}
if (Manager.IsRewardItems())
{
SetCustomWinLine("You earned the Grim Reaper Pet!");
for (Player player : GetPlayers(false))
{
//Prevent game hopping
if (!player.isOnline())
continue;
// PetReward pr = new PetReward(Manager.getCosmeticManager().getPetManager(), Manager.getInventoryManager(), Manager.GetDonation(), "Grim Reaper", "Grim Reaper", PetType.BLAZE, RewardRarity.OTHER, 0, 0);
// @Override
// public void EndCheck()
// {
// if (!IsLive())
// return;
//
// if (pr.canGiveReward(player))
// {
// pr.giveReward(null, player, data -> {});
// }
}
}
AnnounceEnd(this.GetTeamList().get(0));
SetState(GameState.End);
}
else if (GetPlayers(true).size() == 0)
{
for (Player player : GetPlayers(false))
{
Manager.GetGame().AddGems(player, 10, "Participation", false, false);
}
AnnounceEnd(this.GetTeamList().get(1));
SetState(GameState.End);
}
}
// if (_wave >= _waves.size())
// {
// for (Player player : GetPlayers(false))
// {
// Manager.GetGame().AddGems(player, 30, "Killing the Pumpkin Prince", false, false);
// Manager.GetGame().AddGems(player, 10, "Participation", false, false);
// }
//
// if (Manager.IsRewardItems())
// {
// SetCustomWinLine("You earned the Grim Reaper Pet!");
//
// for (Player player : GetPlayers(false))
// {
// //Prevent game hopping
// if (!player.isOnline())
// continue;
//
//// PetReward pr = new PetReward(Manager.getCosmeticManager().getPetManager(), Manager.getInventoryManager(), Manager.GetDonation(), "Grim Reaper", "Grim Reaper", PetType.BLAZE, RewardRarity.OTHER, 0, 0);
////
//// if (pr.canGiveReward(player))
//// {
//// pr.giveReward(null, player, data -> {});
//// }
// }
// }
//
// AnnounceEnd(this.GetTeamList().get(0));
//
// SetState(GameState.End);
// }
//
// else if (GetPlayers(true).size() == 0)
// {
// for (Player player : GetPlayers(false))
// {
// Manager.GetGame().AddGems(player, 10, "Participation", false, false);
// }
//
// AnnounceEnd(this.GetTeamList().get(1));
//
// SetState(GameState.End);
// }
// }