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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
This commit is contained in:
Shaun Bennett 2015-06-26 02:32:51 -05:00
commit 60901cc17e
6 changed files with 27 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java
View File

@ -81,14 +81,14 @@ public class TextManager extends MiniPlugin
UtilBlockText.MakeText("SURVIVAL", locSurvival, faceSurvival, 159, (byte)5, TextAlign.CENTER);
UtilBlockText.MakeText("SURVIVAL", locSurvival.clone().add(-1, 0, 0), faceSurvival, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
UtilBlockText.MakeText("THE BRIDGES", locSurvival.clone().add(-15, 14, 0), faceSurvival, 159, (byte)4, TextAlign.CENTER);
UtilBlockText.MakeText("THE BRIDGES", locSurvival.clone().add(-16, 14, 0), faceSurvival, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
UtilBlockText.MakeText("SKYWARS", locSurvival.clone().add(-15, 14, 0), faceSurvival, 159, (byte)4, TextAlign.CENTER);
UtilBlockText.MakeText("SKYWARS", locSurvival.clone().add(-16, 14, 0), faceSurvival, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
UtilBlockText.MakeText("SURVIVAL GAMES", locSurvival.clone().add(-15, 21, 0), faceSurvival, 159, (byte)1, TextAlign.CENTER);
UtilBlockText.MakeText("SURVIVAL GAMES", locSurvival.clone().add(-16, 21, 0), faceSurvival, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
UtilBlockText.MakeText("THE BRIDGES", locSurvival.clone().add(-15, 21, 0), faceSurvival, 159, (byte)1, TextAlign.CENTER);
UtilBlockText.MakeText("THE BRIDGES", locSurvival.clone().add(-16, 21, 0), faceSurvival, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
UtilBlockText.MakeText("ULTRA HARDCORE", locSurvival.clone().add(-15, 28, 0), faceSurvival, 159, (byte)14, TextAlign.CENTER);
UtilBlockText.MakeText("ULTRA HARDCORE", locSurvival.clone().add(-16, 28, 0), faceSurvival, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
UtilBlockText.MakeText("SURVIVAL GAMES", locSurvival.clone().add(-15, 28, 0), faceSurvival, 159, (byte)14, TextAlign.CENTER);
UtilBlockText.MakeText("SURVIVAL GAMES", locSurvival.clone().add(-16, 28, 0), faceSurvival, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER);
//Other
UtilBlockText.MakeText("CLASSICS", locClassics, faceOther, 159, (byte)5, TextAlign.CENTER);

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
View File

@ -138,8 +138,7 @@ public class SkyWars extends SoloGame
}, new String[]
{
"Free for all battle in the sky!",
"Collect loot from chests",
"Mine ores on your island",
"Craft or loot gear for combat",
"Last player alive wins!"
});
@ -186,9 +185,7 @@ public class SkyWars extends SoloGame
_help = new String[]
{
"Collect loot from chests to gear up!",
"Don't stand near the edge... You can get knocked off!",
"Collect TNT at the center island to throw and destroy other islands!"
};
setupPlayerLoot();
@ -291,6 +288,7 @@ public class SkyWars extends SoloGame
loc.getBlock().setTypeIdAndData(Material.CHEST.getId(), (byte) UtilMath.r(4), true);
_middleChests.add(loc.getBlock());
_worldBlocks.add(loc.getBlock());
}
}
@ -325,6 +323,7 @@ public class SkyWars extends SoloGame
_spawnChests.add(chest.getBlock());
chest.getBlock().setTypeIdAndData(Material.CHEST.getId(), (byte) UtilMath.r(4), true);
_worldBlocks.add(chest.getBlock());
}
}
}

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);
}
}

9
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/WinWithoutOpeningChestStatTracker.java
View File

@ -9,9 +9,11 @@ import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.games.skywars.events.PlayerOpenChestEvent;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockBreakEvent;
public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
{
@ -34,6 +36,13 @@ public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
}
@EventHandler
public void onBreakChest(BlockBreakEvent event)
{
if (event.getBlock().getType() == Material.CHEST)
_openChest.add(event.getPlayer().getUniqueId());
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
public void onGameStateChange(GameStateChangeEvent event)
{