diff --git a/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Mineplex.Core/src/mineplex/core/game/GameDisplay.java index fb6f9a41..1b49cf71 100644 --- a/Mineplex.Core/src/mineplex/core/game/GameDisplay.java +++ b/Mineplex.Core/src/mineplex/core/game/GameDisplay.java @@ -17,7 +17,7 @@ public enum GameDisplay implements Display CastleAssault("Castle Assault", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.NONE, 67, true), CastleAssaultTDM("Castle Assault TDM", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.NONE, 68, false), CastleSiege("Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.NONE, 4, true), - BetaCastleSiege("Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0, GameCategory.NONE, 4, true), + BetaCastleSiege("Castle Siege", Material.GOLD_CHESTPLATE, (byte)0, GameCategory.NONE, 4, true), ChampionsDominate("Champions Domination", "Champions", Material.BEACON, (byte)0, GameCategory.HARDCORE, 6, true), ChampionsTDM("Champions TDM", "Champions", Material.GOLD_SWORD, (byte)0, GameCategory.NONE, 5, true), Christmas("Christmas Chaos", Material.SNOW_BALL, (byte)0, GameCategory.EVENT, 8, false), diff --git a/Mineplex.Core/target/classes/mineplex/core/game/GameDisplay.class b/Mineplex.Core/target/classes/mineplex/core/game/GameDisplay.class index 6a04424f..20be7ecc 100644 Binary files a/Mineplex.Core/target/classes/mineplex/core/game/GameDisplay.class and b/Mineplex.Core/target/classes/mineplex/core/game/GameDisplay.class differ diff --git a/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java b/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java index 3cb7bd3b..7d325b49 100644 --- a/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java +++ b/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/combat/CombatManager.java @@ -33,6 +33,8 @@ import java.util.concurrent.TimeUnit; public class CombatManager extends MiniClientPlugin { + public static String _cause; + public enum AttackReason { Attack, @@ -131,6 +133,8 @@ public class CombatManager extends MiniClientPlugin } getLog(damagee).Attacked(UtilEnt.getName(damagerEnt), event.getDamage(), damagerEnt, cause, null); + + _cause = cause; } // Damager is WORLD else @@ -207,6 +211,7 @@ public class CombatManager extends MiniClientPlugin reason = "Fireball"; } } + _cause = reason; } if (event.GetDamagerEntity(true) instanceof Player) @@ -247,7 +252,7 @@ public class CombatManager extends MiniClientPlugin source = "Cactus"; break; case CUSTOM: - source = "AlexTheCoder\'s Wrath"; + source = "AlexTheCoder's Wrath"; break; case DROWNING: source = "Water"; @@ -306,7 +311,9 @@ public class CombatManager extends MiniClientPlugin break; } + _cause = source; return Pair.create(source, reason); + } @EventHandler(priority = EventPriority.LOW) diff --git a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class index ecb79cec..aa96fe78 100644 Binary files a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class and b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$1.class differ diff --git a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class index 00188cc7..88676efa 100644 Binary files a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class and b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager$AttackReason.class differ diff --git a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class index 937e6cea..5d412fc2 100644 Binary files a/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class and b/Mineplex.Minecraft.Game.Core/target/classes/mineplex/minecraft/game/core/combat/CombatManager.class differ diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index e2ae8f8c..2f4e0351 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -60,7 +60,11 @@ import mineplex.minecraft.game.core.damage.DamageManager; import nautilus.game.arcade.game.GameServerConfig; import net.minecraft.server.v1_8_R3.MinecraftServer; import org.bukkit.Bukkit; +import org.bukkit.Chunk; +import org.bukkit.World; import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Arrow; +import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.plugin.ServicePriority; @@ -103,7 +107,7 @@ public class Arcade extends JavaPlugin public void onEnable() { plugin = this; - + clearAll(); // modding the config.yml file in Arcade this.saveDefaultConfig(); FileConfiguration config = this.getConfig(); @@ -256,6 +260,18 @@ public class Arcade extends JavaPlugin } + public void clearAll() { + for(World w : getServer().getWorlds()) { + for(Chunk c : w.getLoadedChunks()) { + c.load(); + for(Entity e : c.getEntities()) { + e.remove(); + } + c.unload(true); + } + } + } + @Override public void onDisable() @@ -263,6 +279,8 @@ public class Arcade extends JavaPlugin for (Player player : UtilServer.getPlayers()) player.kickPlayer("Server Shutdown"); + clearAll(); + if (_gameManager.GetGame() != null) if (_gameManager.GetGame().WorldData != null) _gameManager.GetGame().WorldData.Uninitialize(); diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java index fd0e9cdd..6ec7ab02 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java @@ -219,7 +219,7 @@ public enum GameType implements Voteable Event(EventGame.class, GameDisplay.Event, new GameType[]{ GameType.BaconBrawl, GameType.Barbarians, GameType.Bridge, GameType.Build, GameType.Build, - GameType.CastleSiege, GameType.ChampionsDominate, GameType.ChampionsTDM, GameType.Christmas, + GameType.CastleSiege, GameType.BetaCastleSiege, GameType.ChampionsDominate, GameType.ChampionsTDM, GameType.Christmas, GameType.DeathTag, GameType.DragonEscape, GameType.Dragons, GameType.Draw, GameType.Evolution, GameType.Gravity, GameType.Halloween, GameType.HideSeek, GameType.Micro, GameType.MilkCow, GameType.MineStrike, GameType.BawkBawkBattles, diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java index 447b4d12..28f9afd1 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.java @@ -7,6 +7,8 @@ import mineplex.core.preferences.Preference; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.combat.CombatComponent; +import mineplex.minecraft.game.core.combat.CombatManager; +import mineplex.minecraft.game.core.combat.DeathMessageType; import mineplex.minecraft.game.core.condition.ConditionFactory; import mineplex.minecraft.game.core.damage.CustomDamageEvent; import nautilus.game.arcade.ArcadeManager; @@ -35,6 +37,7 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerInteractEvent; @@ -47,6 +50,8 @@ import java.util.*; import java.util.Map.Entry; import java.util.concurrent.TimeUnit; +import static org.bukkit.event.entity.EntityDamageEvent.DamageCause.ENTITY_EXPLOSION; + //import com.mineplex.anticheat.checks.combat.KillauraTypeD; //import mineplex.core.antihack.AntiHack; @@ -687,47 +692,129 @@ public class BetaCastleSiege extends TeamGame } @EventHandler - public void announceDeaths(PlayerDeathEvent event){ + public void announceDeaths(PlayerDeathEvent event) { + + Random rand = new Random(); Player killed = event.getEntity(); String killedName = "Unknown"; - if (killed instanceof CraftPlayer) - { + if (killed instanceof CraftPlayer) { killedName = killed.getName(); - } - else - { + } else { killedName = UtilEnt.getName(killed); } Player killer = killed.getKiller(); String killerName = "Unknown"; - if (killer instanceof CraftPlayer) - { + if (killer instanceof CraftPlayer) { killerName = killer.getName(); - } - else - { + } else { killerName = UtilEnt.getName(killer); } GameTeam murderedDudesTeam = Manager.GetGame().GetTeam(killed); - if (!(murderedDudesTeam == _defenders)){ + if (!(murderedDudesTeam == _defenders)) { return; } - if (_wolves.contains(killed)){ + if (_wolves.contains(killed)) { return; } - Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cRed - + killerName + C.cGray - + " got the last chomp on " + C.cAqua - + killedName + C.cGray + "."); + if (CombatManager._cause.equals("Explosion")) { + int explosionDeaths = rand.nextInt(4); + switch (explosionDeaths) { + case 0: + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " was blasted into oblivion!"); + break; + case 1: + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " went out with a bang"); + break; + case 2: + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " tried poking a TNT carrier."); + break; + case 3: + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " was obliterated by the Undead's nuclear arsenal."); + break; + } + } + + else if (!CombatManager._cause.equals("AlexTheCoder's Wrath")) { + int pvpDeaths = rand.nextInt(4); + + switch (pvpDeaths) { + case 0: + Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cRed + + killerName + C.cGray + + " ate " + C.cAqua + + killedName + C.cGray + "'s last remaining vital organ."); + break; + case 1: + Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cRed + + killerName + C.cGray + + " got the last chomp on " + C.cAqua + + killedName + C.cGray + "."); + break; + case 2: + Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cRed + + killerName + C.cGray + + " made a delicacy out of " + C.cAqua + + killedName + C.cGray + "'s liver."); + break; + case 3: + Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cAqua + + killedName + C.cGray + " died honorably at " + C.cRed + + killerName + C.cGray + "'s bare rotting hands."); + break; + } + } + + else { + int unexplainedDeaths = rand.nextInt(4); + + switch (unexplainedDeaths) { + case 0: + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " died from... \"unnatural\" causes..."); + break; + case 1: + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " suffered AlexTheCoder's wrath!"); + break; + case 2: + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " had a stroke from LT's incompetence."); + break; + case 3: + int imposterCountGen = rand.nextInt(7); + String imposterCount = String.valueOf(imposterCountGen); + + if (imposterCountGen == 0) { + imposterCount = "no"; + } + + Bukkit.broadcastMessage(C.cBlue + "Death> " + + C.cAqua + killedName + C.cGray + + " was ejected. There are " + + imposterCount + " imposters remaining"); + break; + } + } } public nautilus.game.arcade.game.games.castlesiegebeta.BetaCastleSiegeKing getKing() diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java index 2a043437..85f9476a 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java @@ -593,53 +593,53 @@ public class CastleSiegeNew extends TeamGame return _wolves.contains(player); } - @EventHandler - public void announceDeaths(PlayerDeathEvent event){ - if (!Beta.enableBeta){ - DeathOut = false; - return; - } - - Player killed = event.getEntity(); - String killedName = "Unknown"; - - if (killed instanceof CraftPlayer) - { - killedName = killed.getName(); - } - else - { - killedName = UtilEnt.getName(killed); - } - - Player killer = killed.getKiller(); - String killerName = "Unknown"; - - if (killer instanceof CraftPlayer) - { - killerName = killer.getName(); - } - else - { - killerName = UtilEnt.getName(killer); - } - - GameTeam murderedDudesTeam = Manager.GetGame().GetTeam(killed); - - if (!(murderedDudesTeam == _defenders)){ - return; - } - - if (_wolves.contains(killed)){ - return; - } - - Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cRed - + killerName + C.cGray - + " got the last chomp on " + C.cAqua - + killedName + C.cGray + "."); - - } +// @EventHandler +// public void announceDeaths(PlayerDeathEvent event){ +// if (!Beta.enableBeta){ +// DeathOut = false; +// return; +// } +// +// Player killed = event.getEntity(); +// String killedName = "Unknown"; +// +// if (killed instanceof CraftPlayer) +// { +// killedName = killed.getName(); +// } +// else +// { +// killedName = UtilEnt.getName(killed); +// } +// +// Player killer = killed.getKiller(); +// String killerName = "Unknown"; +// +// if (killer instanceof CraftPlayer) +// { +// killerName = killer.getName(); +// } +// else +// { +// killerName = UtilEnt.getName(killer); +// } +// +// GameTeam murderedDudesTeam = Manager.GetGame().GetTeam(killed); +// +// if (!(murderedDudesTeam == _defenders)){ +// return; +// } +// +// if (_wolves.contains(killed)){ +// return; +// } +// +// Bukkit.broadcastMessage(C.cBlue + "Death> " + C.cRed +// + killerName + C.cGray +// + " got the last chomp on " + C.cAqua +// + killedName + C.cGray + "."); +// +// } public CastleSiegeKing getKing() { diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java index 42559f75..d0978504 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.java @@ -62,6 +62,7 @@ public class CastleSiegeTNTManager implements Listener private final CastleSiegeNew _host; private final Map _tntCarrier; + public static String _tntBomber; private List _tntSpawns; private List _tntWeaknesses; private long _lastTNT; @@ -115,6 +116,7 @@ public class CastleSiegeTNTManager implements Listener } Player player = event.getPlayer(); + _tntBomber = player.toString(); Block block = event.getClickedBlock(); if (block == null || block.getType() != Material.TNT || UtilPlayer.isSpectator(player) || !_host.getUndead().HasPlayer(player) || _tntCarrier.containsKey(player)) diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java index 42676d9d..d2cf756f 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/BetaButton.java @@ -5,18 +5,21 @@ import mineplex.core.common.util.UtilServer; import mineplex.core.shop.item.IButton; import mineplex.core.shop.page.ShopPageBase; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.games.Beta; import nautilus.game.arcade.game.games.castlesiegenew.kits.KitHumanPaladin; import nautilus.game.arcade.game.games.castlesiegenew.perks.PerkPaladinBoost; import nautilus.game.arcade.gui.privateServer.PrivateServerShop; +import nautilus.game.arcade.managers.GameHostManager; import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import java.util.Comparator; import java.util.concurrent.TimeUnit; public class BetaButton implements IButton { @@ -47,12 +50,17 @@ public class BetaButton implements IButton { if (Beta.enableBeta) { Beta.enableBeta = false; _arcadeManager.GetGame().Announce(C.cAquaB + "Disabled BETA Features.", true); + GameHostManager._games.remove(GameType.BetaCastleSiege); + GameHostManager._games.add(GameType.CastleSiege); + GameHostManager._games.sort(Comparator.comparing(GameType::getName)); return; } Beta.enableBeta = true; _arcadeManager.GetGame().Announce(C.cAquaB + "Enabled BETA Features. Caution: Highly Experimental!", true); - + GameHostManager._games.add(GameType.BetaCastleSiege); + GameHostManager._games.remove(GameType.CastleSiege); + GameHostManager._games.sort(Comparator.comparing(GameType::getName)); } } diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java index a9fd88c1..5bd90636 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java @@ -22,11 +22,6 @@ public class ChooseMapButton implements IButton _arcadeManager = arcadeManager; _privateServerShop = privateServerShop; _gameType = gameType; - - if(_gameType == GameType.BetaCastleSiege){ - _gameType = GameType.CastleSiege; - } - _map = map; } @@ -38,9 +33,6 @@ public class ChooseMapButton implements IButton { _arcadeManager.GetGameCreationManager().MapSource = _gameType.getMapSource()[0]; } - else{ - Bukkit.broadcastMessage(C.cRed + "Error Loading Maps: None defined for " + _gameType); - } _arcadeManager.GetGameCreationManager().MapPref = _map.replaceAll(" ", ""); _arcadeManager.GetGame().setGame(_gameType, player, true); diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java index f7abdc02..a207b3e8 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.java @@ -19,9 +19,9 @@ public class ChooseMapPage extends BasePage super(plugin, shop, "Choose Map", player); _gameType = gameType; - if(_gameType == GameType.BetaCastleSiege){ - _gameType = GameType.CastleSiege; - } +// if(_gameType == GameType.BetaCastleSiege){ +// _gameType = GameType.CastleSiege; +// } buildPage(); } @@ -33,6 +33,10 @@ public class ChooseMapPage extends BasePage int slot = 9; +// if(_gameType == GameType.BetaCastleSiege){ +// _gameType = GameType.CastleSiege; +// } + String loadMaps = _gameType.getName(); if(_gameType.getMapSource() != null) diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java index 4765d6ab..af9a5a09 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java @@ -83,15 +83,15 @@ public class SetGamePage extends BasePage { if (clickType == ClickType.LEFT) { - if(type == GameType.CastleSiege){ - if(Beta.enableBeta){ - getPlugin().GetGame().setGame(GameType.BetaCastleSiege, player, true); - } - else{ - getPlugin().GetGame().setGame(GameType.CastleSiege, player, true); - } - } - +// if(type == GameType.CastleSiege){ +// if(Beta.enableBeta){ +// getPlugin().GetGame().setGame(GameType.BetaCastleSiege, player, true); +// } +// else{ +// getPlugin().GetGame().setGame(GameType.CastleSiege, player, true); +// } +// } + getPlugin().GetGame().setGame(type, player, true); player.closeInventory(); } else if (clickType == ClickType.RIGHT) @@ -102,15 +102,15 @@ public class SetGamePage extends BasePage // return; // } - if(type == GameType.CastleSiege){ - if(Beta.enableBeta){ - getShop().openPageForPlayer(player, new ChooseMapPage(getPlugin(), getShop(), player, GameType.BetaCastleSiege)); - Bukkit.broadcastMessage(C.cAqua + "Selecting Maps for: Castle Siege Beta"); - } - else{ - getShop().openPageForPlayer(player, new ChooseMapPage(getPlugin(), getShop(), player, type)); - } - } +// if(type == GameType.CastleSiege){ +// if(Beta.enableBeta){ +// getShop().openPageForPlayer(player, new ChooseMapPage(getPlugin(), getShop(), player, GameType.BetaCastleSiege)); +// Bukkit.broadcastMessage(C.cAqua + "Selecting Maps for: Castle Siege Beta"); +// } +// else{ +// getShop().openPageForPlayer(player, new ChooseMapPage(getPlugin(), getShop(), player, type)); +// } +// } getShop().openPageForPlayer(player, new ChooseMapPage(getPlugin(), getShop(), player, type)); } diff --git a/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index 126f8c5c..31b5a371 100644 --- a/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -17,6 +17,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.Game.GameState; +import nautilus.game.arcade.game.games.Beta; import nautilus.game.arcade.gui.privateServer.PrivateServerShop; import nautilus.game.arcade.gui.privateServer.page.GameVotingPage; import org.bukkit.*; @@ -44,7 +45,7 @@ public class GameHostManager implements Listener } // private final AntiHack _antiHack; - private List _games = new ArrayList<>(); + public static List _games = new ArrayList<>(); ArcadeManager Manager; @@ -105,7 +106,7 @@ public class GameHostManager implements Listener _games.add(GameType.Bridge); _games.add(GameType.SurvivalGames); _games.add(GameType.CastleSiege); - _games.add(GameType.BetaCastleSiege); + _games.add(GameType.WitherAssault); _games.add(GameType.Wizards); _games.add(GameType.Build); diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/Arcade.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/Arcade.class index 2cbb6ca5..51637c5f 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/Arcade.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/Arcade.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/GameType.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/GameType.class index 64b8a092..558b48bf 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/GameType.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/GameType.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class index ef272778..b9a57573 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegebeta/BetaCastleSiege.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class index 25717f3f..dc058f4c 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.class index 7ec2c1fc..38875bd9 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeTNTManager.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class index de3c1b5e..fc2b5772 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/BetaButton.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.class index 246db609..2fc07712 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.class index 4c686fbd..b2431510 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/ChooseMapPage.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/SetGamePage.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/SetGamePage.class index ef9a8bd1..badc0f10 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/SetGamePage.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/gui/privateServer/page/SetGamePage.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager$Perm.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager$Perm.class index 9bcac443..1fb7b3db 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager$Perm.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager$Perm.class differ diff --git a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager.class b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager.class index 35d46ece..0a68853c 100644 Binary files a/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager.class and b/Nautilus.Game.Arcade/target/classes/nautilus/game/arcade/managers/GameHostManager.class differ diff --git a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar index 0939641b..f7568e4f 100644 Binary files a/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar and b/out/artifacts/nautilus_game_arcade_jar/nautilus-game-arcade.jar differ