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

Fixed things. 

• Added a cancelled check to No Ability 
• Removed tokens on quit.
• Checked if players are alive before giving them places.
This commit is contained in:
Mysticate 2015-09-01 01:59:36 -04:00
parent becfbe1f13
commit b4ce33a916
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,7 @@ import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerItemHeldEvent; import org.bukkit.event.player.PlayerItemHeldEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
public class Evolution extends SoloGame public class Evolution extends SoloGame
@ -141,7 +142,7 @@ public class Evolution extends SoloGame
GemAssistDeathRespawn = .5; GemAssistDeathRespawn = .5;
CompassEnabled = true; CompassEnabled = true;
CompassGiveItem = false; CompassGiveItem = false;
AutomaticRespawn = false; AutomaticRespawn = false;
DeathSpectateSecs = 4.0; DeathSpectateSecs = 4.0;
@ -149,8 +150,7 @@ public class Evolution extends SoloGame
VersionRequire1_8 = true; VersionRequire1_8 = true;
CreatureAllow = false; CreatureAllow = false;
InventoryClick = false;
InventoryClick = false;
InventoryOpenBlock = false; InventoryOpenBlock = false;
@ -223,6 +223,12 @@ public class Evolution extends SoloGame
upgradeKit(event.GetPlayer(), false); upgradeKit(event.GetPlayer(), false);
} }
@EventHandler
public void removeToken(PlayerQuitEvent event)
{
_tokens.remove(event.getPlayer().getName());
}
// //Double Kit // //Double Kit
// @EventHandler(priority = EventPriority.MONITOR) // @EventHandler(priority = EventPriority.MONITOR)
// public void storeTokens(GameStateChangeEvent event) // public void storeTokens(GameStateChangeEvent event)
@ -414,7 +420,7 @@ public class Evolution extends SoloGame
} }
} }
@EventHandler @EventHandler(priority = EventPriority.MONITOR)
public void onKill(CombatDeathEvent event) public void onKill(CombatDeathEvent event)
{ {
event.SetBroadcastType(DeathMessageType.Simple); event.SetBroadcastType(DeathMessageType.Simple);
@ -747,7 +753,11 @@ public class Evolution extends SoloGame
for (int i = 0 ; i < tokens.size() ; i++) for (int i = 0 ; i < tokens.size() ; i++)
{ {
players.add(tokens.get(i).Player); Player cur = tokens.get(i).Player;
if (!cur.isOnline())
continue;
players.add(cur);
} }
//Award Gems //Award Gems
@ -804,19 +814,14 @@ public class Evolution extends SoloGame
Scoreboard.WriteBlank(); Scoreboard.WriteBlank();
int index = 0; Scoreboard.Write(C.cYellow + C.Bold + "First to " + _mobKits.size());
Scoreboard.WriteBlank();
for (Player player : GetPlayers(true)) for (Player player : GetPlayers(true))
{ {
if (index > 11) Scoreboard.WriteOrdered("Score", C.cGreen + player.getName(), getScore(player), true);
break;
Scoreboard.WriteOrdered("Score", C.cGreen + player.getName(), getScore(player), true);
index++;
} }
Scoreboard.WriteBlank();
Scoreboard.Write(C.cGold + C.Bold + "First to " + _mobKits.size());
Scoreboard.Draw(); Scoreboard.Draw();
} }

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

@ -29,6 +29,9 @@ public class NoAbilityTracker extends StatTracker<Evolution>
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onEvolutionAbility(EvolutionAbilityUseEvent event) public void onEvolutionAbility(EvolutionAbilityUseEvent event)
{ {
if (event.isCancelled())
return;
if (!getGame().IsLive()) if (!getGame().IsLive())
return; return;