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

Merge branch 'Myst_EVO'

Browse Source
This commit is contained in:
Mini-Chiss 2015-08-28 20:31:56 -07:00
commit 4ac6b22e53
3 changed files with 17 additions and 28 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/games/evolution/Evolution.java
View File

@ -51,13 +51,13 @@ import nautilus.game.arcade.game.games.evolution.mobs.KitCreeper;
import nautilus.game.arcade.game.games.evolution.mobs.KitGolem;
import nautilus.game.arcade.game.games.evolution.mobs.KitSlime;
import nautilus.game.arcade.game.games.evolution.mobs.KitSpider;
import nautilus.game.arcade.game.games.evolution.trackers.EvoWinWithoutDyingTracker;
import nautilus.game.arcade.game.games.evolution.trackers.KillsWhileEvolvingTracker;
import nautilus.game.arcade.game.games.evolution.trackers.NoAbilityTracker;
import nautilus.game.arcade.game.games.evolution.trackers.NoDamageWhileEvolvingTracker;
import nautilus.game.arcade.game.games.evolution.trackers.NoMeleeTracker;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.stats.KillFastStatTracker;
import nautilus.game.arcade.stats.WinWithoutDyingStatTracker;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -94,6 +94,8 @@ public class Evolution extends SoloGame
private ArrayList<Player> _evolutionsAvailable = new ArrayList<Player>();
private NautHashMap<String, Float> _chargingExp = new NautHashMap<String, Float>();
public Player Winner = null;
@SuppressWarnings("unchecked")
public Evolution(ArcadeManager manager)
{
@ -155,7 +157,7 @@ public class Evolution extends SoloGame
Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.Attack);
registerStatTrackers(
new WinWithoutDyingStatTracker(this, "NoDeaths"),
new EvoWinWithoutDyingTracker(this),
new NoDamageWhileEvolvingTracker(this),
new KillFastStatTracker(this, 3, 5, "Rampage"),
new NoAbilityTracker(this),
@ -746,9 +748,9 @@ public class Evolution extends SoloGame
for (Player player : GetPlayers(false))
if (player.isOnline())
AddGems(player, 10, "Participation", false, false);
if (tokens.size() >= 1)
players = players.subList(0, 1);
if (players.size() >= 1)
Winner = players.get(0);
_tokens.clear();
_evoPlatforms.clear();

17
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/trackers/NoAbilityTracker.java
View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.games.evolution.trackers;
import java.util.ArrayList;
import java.util.List;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game.GameState;
@ -9,7 +8,6 @@ import nautilus.game.arcade.game.games.evolution.Evolution;
import nautilus.game.arcade.game.games.evolution.events.EvolutionAbilityUseEvent;
import nautilus.game.arcade.stats.StatTracker;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
@ -45,17 +43,12 @@ public class NoAbilityTracker extends StatTracker<Evolution>
if (event.GetState() != GameState.End)
return;
List<Player> winners = getGame().getWinners();
if (winners == null)
if (getGame().Winner == null)
return;
for (Player winner : winners)
{
if (_out.contains(winner.getName()))
continue;
addStat(winner, "MeleeOnly", 1, true, false);
}
if (_out.contains(getGame().Winner.getName()))
return;
addStat(getGame().Winner, "MeleeOnly", 1, true, false);
}
}

16
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/trackers/NoMeleeTracker.java
View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.games.evolution.trackers;
import java.util.ArrayList;
import java.util.List;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.events.GameStateChangeEvent;
@ -52,17 +51,12 @@ public class NoMeleeTracker extends StatTracker<Evolution>
if (event.GetState() != GameState.End)
return;
List<Player> winners = getGame().getWinners();
if (winners == null)
if (getGame().Winner == null)
return;
for (Player winner : winners)
{
if (_out.contains(winner.getName()))
continue;
addStat(winner, "AbilityOnly", 1, true, false);
}
if (_out.contains(getGame().Winner.getName()))
return;
addStat(getGame().Winner, "AbilityOnly", 1, true, false);
}
}