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

Merge branch 'Myst_EVO'

Browse Source 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
This commit is contained in:
Mini-Chiss 2015-08-28 19:59:48 -07:00
commit d879bc68ab
2 changed files with 10 additions and 4 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

@ -4,6 +4,7 @@ import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
@ -25,6 +26,7 @@ import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.combat.CombatComponent;
import mineplex.minecraft.game.core.combat.DeathMessageType;
import mineplex.minecraft.game.core.combat.CombatManager.AttackReason;
import mineplex.minecraft.game.core.combat.DeathMessageType;
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
import mineplex.minecraft.game.core.condition.Condition.ConditionType;
import mineplex.minecraft.game.core.condition.ConditionActive;
@ -146,8 +148,7 @@ public class Evolution extends SoloGame
VersionRequire1_8 = true;
CreatureAllow = false;
InventoryClick = false;
InventoryClick = false;
InventoryOpenBlock = false;
@ -405,6 +406,8 @@ public class Evolution extends SoloGame
@EventHandler
public void onKill(CombatDeathEvent event)
{
event.SetBroadcastType(DeathMessageType.Simple);
if (!IsLive())
return;
@ -722,7 +725,7 @@ public class Evolution extends SoloGame
ArrayList<EvoToken> tokens = new ArrayList<EvoToken>(_tokens.values());
Collections.sort(tokens);
ArrayList<Player> players = new ArrayList<Player>();
List<Player> players = new ArrayList<Player>();
for (int i = 0 ; i < tokens.size() ; i++)
{
@ -744,6 +747,9 @@ public class Evolution extends SoloGame
if (player.isOnline())
AddGems(player, 10, "Participation", false, false);
if (tokens.size() >= 1)
players = players.subList(0, 1);
_tokens.clear();
_evoPlatforms.clear();
_evolutionsAvailable.clear();

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

@ -39,7 +39,7 @@ public class NoMeleeTracker extends StatTracker<Evolution>
if (!getGame().IsAlive(player))
return;
if (event.GetReason() == null || event.GetReason().contains("Attack"))
if (event.GetReason() == null || event.GetReason().trim().equals("") || event.GetReason().contains("Attack"))
{
if (!_out.contains(player.getName()))
_out.add(player.getName());