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

skywars!

Browse Source
This commit is contained in:
Cheese 2015-06-26 16:38:44 +10:00
parent 257c088948
commit 027efe02fc
4 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
View File

@ -33,7 +33,7 @@ public enum AchievementCategory
SKYWARS("SkyWars",null,
new StatDisplay[]{StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED},
Material.INK_SACK, 0,GameCategory.SURVIVAL, "Destructor Kit"),
Material.SAPLING, 3,GameCategory.SURVIVAL, "Destructor Kit"),
WIZARDS("Wizards", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkChicken.java
View File

@ -94,6 +94,12 @@ public class PerkChicken extends Perk
{
String playerName = ownerIterator.next();
Player owner = Bukkit.getPlayer(playerName);
if (owner == null)
{
ownerIterator.remove();
continue;
}
Creature chicken = _activeKitHolders.get(playerName);
Location chickenSpot = chicken.getLocation();

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMadScientist.java
View File

@ -55,8 +55,8 @@ public class PerkMadScientist extends Perk implements IThrown
{
super("Mad Scientist", new String[]
{
"Recieve 1 throwable egg 90 seconds! (Max 3)",
"Eggs spawn a loyal minion to fight with you",
"Recieve 1 Egg every 90 seconds! (Max 3)",
"Eggs spawn a loyal minion to fight for you",
});
}

37
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/SkyWarsTNTKillStatTracker.java
View File

@ -1,37 +0,0 @@
package nautilus.game.arcade.stats;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.games.skywars.events.TNTKillEvent;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
public class SkyWarsTNTKillStatTracker extends StatTracker<Game>
{
public SkyWarsTNTKillStatTracker(Game game)
{
super(game);
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
public void onTNTPickup(TNTKillEvent event)
{
if (getGame().GetState() != Game.GameState.Live)
return;
if (!(event.getKiller() instanceof Player))
{
return;
}
if (!(event.getVictim() instanceof Player))
{
return;
}
addStat(event.getKiller(), "BombKills", 1, false, false);
}
}