From 262c6c2fa68bead5883a1f9024193ad59c6ec2cc Mon Sep 17 00:00:00 2001 From: Joseph Prezioso Jr Date: Fri, 25 Mar 2016 13:53:20 -0400 Subject: [PATCH] Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur --- .../src/nautilus/game/arcade/game/Game.java | 2 +- .../game/games/barbarians/Barbarians.java | 38 ++++++------ .../game/games/bossbattles/BossBattles.java | 6 +- .../game/games/bouncyballs/BouncyBalls.java | 2 +- .../game/arcade/game/games/bridge/Bridge.java | 48 +++++++-------- .../game/arcade/game/games/build/Build.java | 42 +++++++------- .../game/arcade/game/games/cards/Cards.java | 12 ++-- .../game/games/castlesiege/CastleSiege.java | 28 ++++----- .../game/games/champions/ChampionsCTF.java | 8 +-- .../games/champions/ChampionsDominate.java | 8 +-- .../game/games/champions/ChampionsTDM.java | 8 +-- .../game/games/christmas/Christmas.java | 12 ++-- .../games/christmas/content/BossMobs.java | 4 +- .../christmas/content/BossSnowmanPattern.java | 4 +- .../games/christmas/content/CaveGiant.java | 4 +- .../game/games/common/CaptureTheFlag.java | 16 ++--- .../arcade/game/games/common/Domination.java | 14 ++--- .../arcade/game/games/deathtag/DeathTag.java | 8 +-- .../game/games/dragonescape/DragonEscape.java | 14 ++--- .../games/dragonescape/DragonEscapeTeams.java | 10 ++-- .../game/games/dragonriders/DragonData.java | 4 +- .../game/games/dragonriders/DragonRiders.java | 4 +- .../arcade/game/games/dragons/Dragons.java | 10 ++-- .../game/games/dragons/DragonsTeams.java | 12 ++-- .../game/arcade/game/games/draw/Draw.java | 8 +-- .../arcade/game/games/event/EventGame.java | 54 ++++++++--------- .../arcade/game/games/event/EventModule.java | 58 +++++++++---------- .../halloween/creatures/CreatureBase.java | 4 +- .../game/games/lobbers/BombLobbers.java | 22 +++---- .../challenges/ChallengeDragonEgg.java | 4 +- .../challenges/ChallengeHitTargets.java | 4 +- .../challenges/ChallengeMilkACow.java | 4 +- .../challenges/ChallengeNameThatSound.java | 4 +- .../challenges/ChallengeShootChickens.java | 8 +-- .../mineware/challenges/ChallengeSkyFall.java | 4 +- .../challenges/ChallengeSmashOff.java | 4 +- .../challenges/ChallengeTntLauncher.java | 2 +- .../challenges/ChallengeVolleyPig.java | 8 +-- 38 files changed, 253 insertions(+), 253 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index a64e2271d..872430213 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -207,7 +207,7 @@ public abstract class Game implements Listener public GameOptionDouble DeathSpectateSecs = new GameOptionDouble(0, "Death Spectate Secs", "How many seconds players may spectate match while dead"); public GameOptionBoolean DeathTeleport = new GameOptionBoolean(true, "Death Teleport", "Do players teleport upon death?"); - public GameOptionBoolean QuitOut = new GameOptionBoolean(true, "Quit Out", "Are players considered out if they quit?"); + public GameOptionBoolean QuitOut = new GameOptionBoolean(true, "Quit Out", "Are players allowed to quit?"); public GameOptionBoolean QuitDropItems = new GameOptionBoolean(false, "Quit Drop Items", "Do players drop items if they quit?"); public GameOptionBoolean IdleKickz = new GameOptionBoolean(true, "Idle Kickz", "Are idle players kicked?"); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/Barbarians.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/Barbarians.java index c48e919eb..fe767cbb1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/Barbarians.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/Barbarians.java @@ -39,27 +39,27 @@ public class Barbarians extends SoloGame "Last player alive wins!" }); - this.DamageTeamSelf = true; + this.DamageTeamSelf.SetOption(true); this.CompassEnabled = true; - this.BlockBreakAllow.add(5); - this.BlockBreakAllow.add(17); - this.BlockBreakAllow.add(18); - this.BlockBreakAllow.add(20); - this.BlockBreakAllow.add(30); - this.BlockBreakAllow.add(47); - this.BlockBreakAllow.add(53); - this.BlockBreakAllow.add(54); - this.BlockBreakAllow.add(58); - this.BlockBreakAllow.add(64); - this.BlockBreakAllow.add(83); - this.BlockBreakAllow.add(85); - this.BlockBreakAllow.add(96); - this.BlockBreakAllow.add(125); - this.BlockBreakAllow.add(126); - this.BlockBreakAllow.add(134); - this.BlockBreakAllow.add(135); - this.BlockBreakAllow.add(136); + this.BlockBreakAllow.GetOption().add(5); + this.BlockBreakAllow.GetOption().add(17); + this.BlockBreakAllow.GetOption().add(18); + this.BlockBreakAllow.GetOption().add(20); + this.BlockBreakAllow.GetOption().add(30); + this.BlockBreakAllow.GetOption().add(47); + this.BlockBreakAllow.GetOption().add(53); + this.BlockBreakAllow.GetOption().add(54); + this.BlockBreakAllow.GetOption().add(58); + this.BlockBreakAllow.GetOption().add(64); + this.BlockBreakAllow.GetOption().add(83); + this.BlockBreakAllow.GetOption().add(85); + this.BlockBreakAllow.GetOption().add(96); + this.BlockBreakAllow.GetOption().add(125); + this.BlockBreakAllow.GetOption().add(126); + this.BlockBreakAllow.GetOption().add(134); + this.BlockBreakAllow.GetOption().add(135); + this.BlockBreakAllow.GetOption().add(136); registerStatTrackers( new BlockBreakStatTracker(this, true) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java index 0ecfe91f4..539c53c79 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bossbattles/BossBattles.java @@ -55,9 +55,9 @@ public class BossBattles extends TeamGame "Fight some bosses" }); - HungerSet = 20; - CreatureAllowOverride = true; - PrepareFreeze = false; + HungerSet.SetOption(20); + CreatureAllowOverride.SetOption(true); + PrepareFreeze.SetOption(false); // registerChatStats(Kills); // Game giving constant errors when loading. diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bouncyballs/BouncyBalls.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bouncyballs/BouncyBalls.java index ce464297f..18ad27ab4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bouncyballs/BouncyBalls.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bouncyballs/BouncyBalls.java @@ -35,7 +35,7 @@ public class BouncyBalls extends SoloGame "BOUNCE" }); - this.HungerSet = 20; + this.HungerSet.SetOption(20); // registerChatStats(); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java index 6b97ab4f0..3233c00f7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java @@ -175,45 +175,45 @@ public class Bridge extends TeamGame implements OreObsfucation _ore = new OreHider(); // Flags - GameTimeout.setOption(Manager.IsTournamentServer() ? 5400000 : 3600000); + GameTimeout.SetOption(Manager.IsTournamentServer() ? 5400000 : 3600000); Manager.GetExplosion().SetLiquidDamage(false); - this.StrictAntiHack = true; + this.StrictAntiHack.SetOption(true); - DamageSelf = true; + DamageSelf.SetOption(true); - ItemDrop = true; - ItemPickup = true; + ItemDrop.SetOption(true); + ItemPickup.SetOption(true); - InventoryClick = true; + InventoryClick.SetOption(true); - AnnounceStay = false; + AnnounceStay.SetOption(false); - PrivateBlocks = true; - BlockBreak = true; - BlockPlace = true; + PrivateBlocks.SetOption(true); + BlockBreak.SetOption(true); + BlockPlace.SetOption(true); - InventoryOpenBlock = true; - InventoryOpenChest = true; + InventoryOpenBlock.SetOption(true); + InventoryOpenChest.SetOption(true); - WorldTimeSet = 2000; + WorldTimeSet.SetOption(2000); - WorldWaterDamage = 0; - WorldBoundaryKill = false; + WorldWaterDamage.SetOption(0); + WorldBoundaryKill.SetOption(false); CompassEnabled = true; - DeathDropItems = true; + DeathDropItems.SetOption(true); GemMultiplier = 2.5; - PrepareFreeze = false; + PrepareFreeze.SetOption(false); //Tournament if (Manager.IsTournamentServer()) { - QuitOut = false; + QuitOut.SetOption(false); _gameDesc = new String[] { @@ -273,10 +273,10 @@ public class Bridge extends TeamGame implements OreObsfucation if (!WorldData.GetCustomLocs("WATER_DAMAGE").isEmpty()) { - WorldWaterDamage = 4; + WorldWaterDamage.SetOption(4); } - if (WorldWaterDamage > 0) + if (WorldWaterDamage.GetOption() > 0) { if (WorldData.MapName.equals("Volcanic Islands")) UtilTextMiddle.display(C.cRed + "Warning", "Water is Boiling Hot", 10, 60, 20); @@ -1084,14 +1084,14 @@ public class Bridge extends TeamGame implements OreObsfucation Entity ent; - CreatureAllowOverride = true; + CreatureAllowOverride.SetOption(true); if (rand > 0.66) ent = team.GetSpawn().getWorld().spawn(team.GetSpawn(), Cow.class); else if (rand > 0.33) ent = team.GetSpawn().getWorld().spawn(team.GetSpawn(), Pig.class); else ent = team.GetSpawn().getWorld().spawn(team.GetSpawn(), Chicken.class); - CreatureAllowOverride = false; + CreatureAllowOverride.SetOption(false); _animalSet.get(team).add(ent); } @@ -1395,7 +1395,7 @@ public class Bridge extends TeamGame implements OreObsfucation if (event.getBucket() != Material.WATER_BUCKET) return; - if (WorldWaterDamage > 0) + if (WorldWaterDamage.GetOption() > 0) { UtilPlayer.message( event.getPlayer(), @@ -1597,7 +1597,7 @@ public class Bridge extends TeamGame implements OreObsfucation if (team.GetPlayers(true).size() > 0) teamsAlive.add(team); - if (!QuitOut) + if (!QuitOut.GetOption()) { //Offline Player Team for (GameTeam team : RejoinTeam.values()) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java index 5828ce042..826be9ca4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java @@ -165,29 +165,29 @@ public class Build extends SoloGame "based on the build theme!" }); - this.StrictAntiHack = true; - this.Damage = false; - this.HungerSet = 20; - this.HealthSet = 20; + this.StrictAntiHack.SetOption(true); + this.Damage.SetOption(false); + this.HungerSet.SetOption(20); + this.HealthSet.SetOption(20); - this.BlockBreak = true; - this.BlockPlace = true; + this.BlockBreak.SetOption(true); + this.BlockPlace.SetOption(true); - this.ItemDrop = true; - this.ItemPickup = true; + this.ItemDrop.SetOption(true); + this.ItemPickup.SetOption(true); - this.InventoryClick = true; + this.InventoryClick.SetOption(true); - this.WorldTimeSet = 6000; + this.WorldTimeSet.SetOption(6000); - this.PrepareFreeze = false; + this.PrepareFreeze.SetOption(false); - this.CreatureAllow = true; + this.CreatureAllow.SetOption(true); - this.WorldFireSpread = true; - this.WorldBoneMeal = true; + this.WorldFireSpread.SetOption(true); + this.WorldBoneMeal.SetOption(true); - this.DontAllowOverfill = true; + this.DontAllowOverfill.SetOption(true); UtilServer.getServer().spigot().getConfig().set("view-distance", 4); @@ -275,7 +275,7 @@ public class Build extends SoloGame UtilTextMiddle.display(null, C.cYellow + "Build " + C.cWhite + _word, 0, 80, 5); - this.WorldTimeSet = -1; + this.WorldTimeSet.SetOption(-1); } } @@ -353,13 +353,13 @@ public class Build extends SoloGame _buildStateTime = System.currentTimeMillis(); //Flags - this.BlockBreak = false; - this.BlockPlace = false; + this.BlockBreak.SetOption(false); + this.BlockPlace.SetOption(false); - this.ItemDrop = false; - this.ItemPickup = false; + this.ItemDrop.SetOption(false); + this.ItemPickup.SetOption(false); - this.InventoryClick = false; + this.InventoryClick.SetOption(false); UtilTextMiddle.display(null, C.cYellow + "TIME IS UP!", 0, 60, 5); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/Cards.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/Cards.java index e890a34a2..b6571ba79 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/Cards.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cards/Cards.java @@ -60,14 +60,14 @@ public class Cards extends SoloGame "based on the build theme!" }); - this.StrictAntiHack = true; - this.Damage = false; - this.HungerSet = 20; - this.HealthSet = 20; + this.StrictAntiHack.SetOption(true); + this.Damage.SetOption(false); + this.HungerSet.SetOption(20); + this.HealthSet.SetOption(20); - this.WorldTimeSet = 6000; + this.WorldTimeSet.SetOption(6000); - this.PrepareFreeze = false; + this.PrepareFreeze.SetOption(false); _cardFactory = new CardFactory(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java index 2aced88d1..7f68a616e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/CastleSiege.java @@ -192,12 +192,12 @@ public class CastleSiege extends TeamGame }; - this.StrictAntiHack = true; + this.StrictAntiHack.SetOption(true); - this.HungerSet = 20; - this.DeathOut = false; - this.WorldTimeSet = 14000; //14000 - this.BlockPlaceAllow.add(85); + this.HungerSet.SetOption(20); + this.DeathOut.SetOption(false); + this.WorldTimeSet.SetOption(14000); //14000 + this.BlockPlaceAllow.GetOption().add(85); _kingName = C.cYellow + C.Bold + "King Sparklez"; @@ -307,9 +307,9 @@ public class CastleSiege extends TeamGame if (GetKits().length <= 5 + i) continue; - this.CreatureAllowOverride = true; + this.CreatureAllowOverride.SetOption(true); Entity ent = GetKits()[5 + i].SpawnEntity(WorldData.GetDataLocs("PINK").get(i)); - this.CreatureAllowOverride = false; + this.CreatureAllowOverride.SetOption(false); Manager.GetLobby().AddKitLocation(ent, GetKits()[5 + i], WorldData.GetDataLocs("PINK").get(i)); } @@ -323,9 +323,9 @@ public class CastleSiege extends TeamGame for (Location loc : _horseSpawns) { - this.CreatureAllowOverride = true; + this.CreatureAllowOverride.SetOption(true); Horse horse = loc.getWorld().spawn(loc, Horse.class); - this.CreatureAllowOverride = false; + this.CreatureAllowOverride.SetOption(false); horse.setAdult(); horse.setAgeLock(true); @@ -387,7 +387,7 @@ public class CastleSiege extends TeamGame return; //Spawn King - this.CreatureAllowOverride = true; + this.CreatureAllowOverride.SetOption(true); _kingLoc = _kingLocs.get(UtilMath.r(_kingLocs.size())); @@ -404,7 +404,7 @@ public class CastleSiege extends TeamGame _king.setRemoveWhenFarAway(false); - this.CreatureAllowOverride = false; + this.CreatureAllowOverride.SetOption(false); } @EventHandler(priority = EventPriority.HIGH) @@ -555,7 +555,7 @@ public class CastleSiege extends TeamGame Scoreboard.Write(_kingHealth + " Health"); } - long timeLeft = 24000 - WorldTimeSet; + long timeLeft = 24000 - WorldTimeSet.GetOption(); timeLeft = timeLeft / 20 * 1000; @@ -584,7 +584,7 @@ public class CastleSiege extends TeamGame if (!IsLive()) return; - if (this.WorldTimeSet > 24100) + if (this.WorldTimeSet.GetOption() > 24100) { SetCustomWinLine(_kingName + ChatColor.RESET + " has survived the siege!"); @@ -937,7 +937,7 @@ public class CastleSiege extends TeamGame if (event.getType() != UpdateType.TICK) return; - WorldTimeSet = (WorldTimeSet + 1); + WorldTimeSet.SetOption(WorldTimeSet.GetOption() + 1); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java index c2633e3b4..7551da2e8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java @@ -67,16 +67,16 @@ public class ChampionsCTF extends CaptureTheFlag Manager.getClassManager().GetItemFactory().getProximityManager().setProxyLimit(6); - this.StrictAntiHack = true; + this.StrictAntiHack.SetOption(true); - InventoryOpenChest = true; + InventoryOpenChest.SetOption(true); EloRanking = false; EloStart = 1000; - this.DontAllowOverfill = true; + this.DontAllowOverfill.SetOption(true); - this.DisableKillCommand = false; + this.DisableKillCommand.SetOption(false); registerStatTrackers( new KillReasonStatTracker(this, "Backstab", "Assassination", false), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java index 83b44d9de..975c7928c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java @@ -62,16 +62,16 @@ public class ChampionsDominate extends Domination Manager.getClassManager().GetItemFactory().getProximityManager().setProxyLimit(6); - this.StrictAntiHack = true; + this.StrictAntiHack.SetOption(true); - InventoryOpenChest = true; + InventoryOpenChest.SetOption(true); EloRanking = false; EloStart = 1000; - this.DontAllowOverfill = true; + this.DontAllowOverfill.SetOption(true); - this.DisableKillCommand = false; + this.DisableKillCommand.SetOption(false); registerStatTrackers( new KillReasonStatTracker(this, "Backstab", "Assassination", false), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java index 73bbb3812..b89d8b19f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java @@ -63,13 +63,13 @@ public class ChampionsTDM extends TeamDeathmatch Manager.getClassManager().GetItemFactory().getProximityManager().setProxyLimit(6); - this.StrictAntiHack = true; + this.StrictAntiHack.SetOption(true); - InventoryOpenChest = true; + InventoryOpenChest.SetOption(true); - this.DisableKillCommand = false; + this.DisableKillCommand.SetOption(false); - this.DontAllowOverfill = true; + this.DontAllowOverfill.SetOption(true); registerStatTrackers( new WinWithoutLosingTeammateStatTracker(this, "FlawlessVictory"), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java index 5e68140ee..48df41bf9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/Christmas.java @@ -148,10 +148,10 @@ public class Christmas extends SoloGame "Defeat the Thief who stole the Presents!" }); - BlockBreakAllow.add(4); - HungerSet = 20; - WorldTimeSet = 2000; - PrepareFreeze = false; + BlockBreakAllow.GetOption().add(4); + HungerSet.SetOption(20); + WorldTimeSet.SetOption(2000); + PrepareFreeze.SetOption(false); registerChatStats( DamageDealt, @@ -332,7 +332,7 @@ public class Christmas extends SoloGame Location loc = christmas.GetSleigh().GetLocation(); - christmas.CreatureAllowOverride = true; + christmas.CreatureAllowOverride.SetOption(true); for (int i=0 ; i<20 ; i++) { Location elfLoc = UtilBlock.getHighest(loc.getWorld(), (int)(loc.getX() + 20 - Math.random()*40), (int)(loc.getZ() + 20 - Math.random()*40)).getLocation().add(0.5, 0.5, 0.5); @@ -345,7 +345,7 @@ public class Christmas extends SoloGame elf.setCustomName("Elf"); } - christmas.CreatureAllowOverride = false; + christmas.CreatureAllowOverride.SetOption(false); } }, 20); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossMobs.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossMobs.java index 39cce1f42..fcf9760b3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossMobs.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossMobs.java @@ -55,9 +55,9 @@ public class BossMobs _lastSpawn = System.currentTimeMillis(); //Spawn - Host.Host.CreatureAllowOverride = true; + Host.Host.CreatureAllowOverride.SetOption(true); Creature ent = UtilAlg.Random(_spawns).getWorld().spawn(UtilAlg.Random(_spawns), Skeleton.class); - Host.Host.CreatureAllowOverride = false; + Host.Host.CreatureAllowOverride.SetOption(false); //Weapon double r = Math.random(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossSnowmanPattern.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossSnowmanPattern.java index 0b0909fd9..8ebb2395d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossSnowmanPattern.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/BossSnowmanPattern.java @@ -106,7 +106,7 @@ public class BossSnowmanPattern _lastSpawn = System.currentTimeMillis(); - Host.Host.CreatureAllowOverride = true; + Host.Host.CreatureAllowOverride.SetOption(true); //Spawn A for (int i=0 ; i<_spawnA.size() ; i++) @@ -134,7 +134,7 @@ public class BossSnowmanPattern _ents.add(new BossSnowman(ent, loc, _bDir)); } - Host.Host.CreatureAllowOverride = false; + Host.Host.CreatureAllowOverride.SetOption(false); } private void MoveDieHit() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/CaveGiant.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/CaveGiant.java index 65c5b40d1..38412db30 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/CaveGiant.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/christmas/content/CaveGiant.java @@ -27,9 +27,9 @@ public class CaveGiant { Host = host; - Host.Host.CreatureAllowOverride = true; + Host.Host.CreatureAllowOverride.SetOption(true); _ent = loc.getWorld().spawn(loc, Giant.class); - Host.Host.CreatureAllowOverride = false; + Host.Host.CreatureAllowOverride.SetOption(false); UtilEnt.Vegetate(_ent); _ent.setMaxHealth(300); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java index d2d8dd2e8..fe48fdf18 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/CaptureTheFlag.java @@ -98,12 +98,12 @@ public class CaptureTheFlag extends TeamGame }); - this.DeathOut = false; - this.PrepareFreeze = true; - this.HungerSet = 20; - this.WorldTimeSet = 2000; + this.DeathOut.SetOption(false); + this.PrepareFreeze.SetOption(true); + this.HungerSet.SetOption(20); + this.WorldTimeSet.SetOption(2000); - this.DeathSpectateSecs = 10; + this.DeathSpectateSecs.SetOption(10); } @Override @@ -129,7 +129,7 @@ public class CaptureTheFlag extends TeamGame if (this instanceof ChampionsCTF) { - CreatureAllowOverride = true; + CreatureAllowOverride.SetOption(true); for (int i = 0; i < GetKits().length && i < WorldData.GetDataLocs("LIGHT_BLUE").size() && i < WorldData.GetDataLocs("PINK").size(); i++) { Entity ent = GetKits()[i].SpawnEntity(WorldData.GetDataLocs("PINK").get(i)); @@ -138,7 +138,7 @@ public class CaptureTheFlag extends TeamGame ent = GetKits()[i].SpawnEntity(WorldData.GetDataLocs("LIGHT_BLUE").get(i)); Manager.GetLobby().AddKitLocation(ent, GetKits()[i], WorldData.GetDataLocs("LIGHT_BLUE").get(i)); } - CreatureAllowOverride = false; + CreatureAllowOverride.SetOption(false); } //End kit spawning @@ -247,7 +247,7 @@ public class CaptureTheFlag extends TeamGame else { _suddenDeath = true; - this.DeathOut = true; + this.DeathOut.SetOption(true); UtilTextMiddle.display(C.cYellow + "Sudden Death", "Next Capture Wins! No Respawns!"); return; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java index c92af3e1f..547cb424a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java @@ -80,12 +80,12 @@ public class Domination extends TeamGame }); - this.DeathOut = false; - this.PrepareFreeze = true; - this.HungerSet = 20; - this.WorldTimeSet = 2000; + this.DeathOut.SetOption(false); + this.PrepareFreeze.SetOption(true); + this.HungerSet.SetOption(20); + this.WorldTimeSet.SetOption(2000); - this.DeathSpectateSecs = 10; + this.DeathSpectateSecs.SetOption(10); //this.QuitOut = false; } @@ -113,7 +113,7 @@ public class Domination extends TeamGame //Spawn Kits if (this instanceof ChampionsDominate) { - CreatureAllowOverride = true; + CreatureAllowOverride.SetOption(true); for (int i = 0; i < GetKits().length && i < WorldData.GetDataLocs("RED").size() && i < WorldData.GetDataLocs("BLUE").size(); i++) { @@ -124,7 +124,7 @@ public class Domination extends TeamGame Manager.GetLobby().AddKitLocation(ent, GetKits()[i], WorldData.GetDataLocs("BLUE").get(i)); } - CreatureAllowOverride = false; + CreatureAllowOverride.SetOption(false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/DeathTag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/DeathTag.java index 859257fcb..c7299df4c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/DeathTag.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/DeathTag.java @@ -63,14 +63,14 @@ public class DeathTag extends SoloGame "The last Runner alive wins!" }); - this.StrictAntiHack = true; + this.StrictAntiHack.SetOption(true); - this.DeathOut = false; - this.HungerSet = 20; + this.DeathOut.SetOption(false); + this.HungerSet.SetOption(20); this.CompassEnabled = true; - this.PrepareFreeze = false; + this.PrepareFreeze.SetOption(false); registerStatTrackers(new ComeAtMeBroStatTracker(this)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java index 3cbd0c28d..447ebe3b9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscape.java @@ -114,9 +114,9 @@ public class DragonEscape extends SoloGame "Last player alive wins!" }); - this.DamagePvP = false; - this.HungerSet = 20; - this.BlockPlace = true; + this.DamagePvP.SetOption(false); + this.HungerSet.SetOption(20); + this.BlockPlace.SetOption(true); registerStatTrackers( new ParalympicsStatTracker(this), @@ -176,10 +176,10 @@ public class DragonEscape extends SoloGame _speedMult = WorldData.GetDataLocs("GREEN").get(0).getX()/100d; if (WorldData.MapName.contains("Hell")) - this.WorldTimeSet = 16000; + this.WorldTimeSet.SetOption(16000); if (WorldData.MapName.contains("Pirate")) - this.WorldWaterDamage = 2; + this.WorldWaterDamage.SetOption(2); } @EventHandler @@ -191,9 +191,9 @@ public class DragonEscape extends SoloGame for (Team team : GetScoreboard().GetScoreboard().getTeams()) team.setCanSeeFriendlyInvisibles(true); - this.CreatureAllowOverride = true; + this.CreatureAllowOverride.SetOption(true); EnderDragon dragon = _dragon.getWorld().spawn(_dragon, EnderDragon.class); - this.CreatureAllowOverride = false; + this.CreatureAllowOverride.SetOption(false); dragon.setCustomName(ChatColor.YELLOW + C.Bold + "Douglas the Dragon"); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java index 0b6764bb5..07777fef5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/DragonEscapeTeams.java @@ -81,8 +81,8 @@ public class DragonEscapeTeams extends TeamGame "Last player alive wins!" }); - this.DamagePvP = false; - this.HungerSet = 20; + this.DamagePvP.SetOption(false); + this.HungerSet.SetOption(20); this.TeamArmorHotbar = true; @@ -159,7 +159,7 @@ public class DragonEscapeTeams extends TeamGame _speedMult = WorldData.GetDataLocs("GREEN").get(0).getX()/100d; if (WorldData.MapName.contains("Hell")) - this.WorldTimeSet = 16000; + this.WorldTimeSet.SetOption(16000); } @EventHandler @@ -174,9 +174,9 @@ public class DragonEscapeTeams extends TeamGame if (event.GetState() != GameState.Prepare) return; - this.CreatureAllowOverride = true; + this.CreatureAllowOverride.SetOption(true); EnderDragon dragon = _dragon.getWorld().spawn(_dragon, EnderDragon.class); - this.CreatureAllowOverride = false; + this.CreatureAllowOverride.SetOption(false); dragon.setCustomName(ChatColor.YELLOW + C.Bold + "Douglas the Dragon"); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonData.java index 50df5fe35..8c8cd4e0b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonData.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonData.java @@ -39,10 +39,10 @@ public class DragonData Location = rider.getLocation(); //Spawn Dragon - manager.GetGame().CreatureAllowOverride = true; + manager.GetGame().CreatureAllowOverride.SetOption(true); Dragon = rider.getWorld().spawn(rider.getLocation(), EnderDragon.class); UtilEnt.Vegetate(Dragon); - manager.GetGame().CreatureAllowOverride = false; + manager.GetGame().CreatureAllowOverride.SetOption(false); rider.getWorld().playSound(rider.getLocation(), Sound.ENDERDRAGON_GROWL, 20f, 1f); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonRiders.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonRiders.java index bccf6f3a1..3470056e8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonRiders.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonriders/DragonRiders.java @@ -22,8 +22,8 @@ public class DragonRiders extends SoloGame }); - this.Damage = false; - this.HungerSet = 20; + this.Damage.SetOption(false); + this.HungerSet.SetOption(20); //Chat stats registerChatStats(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java index 2ec7e7daa..68eabad10 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/Dragons.java @@ -59,9 +59,9 @@ public class Dragons extends SoloGame "Last player alive wins!" }); - this.DamagePvP = false; - this.HungerSet = 20; - this.WorldWaterDamage = 4; + this.DamagePvP.SetOption(false); + this.HungerSet.SetOption(20); + this.WorldWaterDamage.SetOption(4); registerStatTrackers( new SparklezStatTracker(this) @@ -153,10 +153,10 @@ public class Dragons extends SoloGame if (_dragons.size() < 7) { - CreatureAllowOverride = true; + CreatureAllowOverride.SetOption(true); EnderDragon ent = GetSpectatorLocation().getWorld().spawn(_dragonSpawns.get(0), EnderDragon.class); UtilEnt.Vegetate(ent); - CreatureAllowOverride = false; + CreatureAllowOverride.SetOption(false); ent.getWorld().playSound(ent.getLocation(), Sound.ENDERDRAGON_GROWL, 20f, 1f); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/DragonsTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/DragonsTeams.java index 9743a5aaf..66ff4f708 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/DragonsTeams.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/DragonsTeams.java @@ -66,10 +66,10 @@ public class DragonsTeams extends TeamGame "Team with longest time survived wins!" }); - this.DamagePvP = false; - this.HungerSet = 20; - this.WorldWaterDamage = 4; - this.PrepareFreeze = false; + this.DamagePvP.SetOption(false); + this.HungerSet.SetOption(20); + this.WorldWaterDamage.SetOption(4); + this.PrepareFreeze.SetOption(false); this.TeamArmor = true; this.TeamArmorHotbar = true; @@ -157,10 +157,10 @@ public class DragonsTeams extends TeamGame if (_dragons.size() < 7) { - CreatureAllowOverride = true; + CreatureAllowOverride.SetOption(true); EnderDragon ent = GetSpectatorLocation().getWorld().spawn(_dragonSpawns.get(0), EnderDragon.class); UtilEnt.Vegetate(ent); - CreatureAllowOverride = false; + CreatureAllowOverride.SetOption(false); ent.getWorld().playSound(ent.getLocation(), Sound.ENDERDRAGON_GROWL, 20f, 1f); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java index cc87cc712..465ec1f06 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java @@ -111,10 +111,10 @@ public class Draw extends SoloGame "Hints are given at top of screen", }); - this.StrictAntiHack = true; - this.Damage = false; - this.HungerSet = 20; - this.WorldTimeSet = 8000; + this.StrictAntiHack.SetOption(true); + this.Damage.SetOption(false); + this.HungerSet.SetOption(20); + this.WorldTimeSet.SetOption(8000); _words = new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java index f90b48ed1..f64756d4c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java @@ -113,41 +113,41 @@ public class EventGame extends Game "" }); - this.JoinInProgress = true; + this.JoinInProgress.SetOption(true); - this.DamageTeamSelf = true; - this.DamagePvP = false; - this.DamageEvP = false; - this.DamagePvE = false; + this.DamageTeamSelf.SetOption(true); + this.DamagePvP.SetOption(false); + this.DamageEvP.SetOption(false); + this.DamagePvE.SetOption(false); - this.DeathMessages = false; - this.DeathOut = false; + this.DeathMessages.SetOption(false); + this.DeathOut.SetOption(false); this.CanAddStats = false; this.CanGiveLoot = false; - this.GadgetsDisabled = false; + this.GadgetsDisabled.SetOption(false); - this.TeleportsDisqualify = false; + this.TeleportsDisqualify.SetOption(false); - this.PrepareFreeze = false; + this.PrepareFreeze.SetOption(false); - this.BlockPlaceCreative = true; - this.BlockBreakCreative = true; + this.BlockPlaceCreative.SetOption(true); + this.BlockBreakCreative.SetOption(true); - this.InventoryClick = true; - this.InventoryOpenBlock = true; - this.InventoryOpenChest = true; + this.InventoryClick.SetOption(true); + this.InventoryOpenBlock.SetOption(true); + this.InventoryOpenChest.SetOption(true); //Dont timeout - this.GameTimeout = -1; + this.GameTimeout.SetOption(-1); _mps = manager.GetGameHostManager(); _functionSigns = new HashMap<>(); _powerdedSigns = new ArrayList<>(); - this.CreatureAllow = true; + this.CreatureAllow.SetOption(true); _customAreas = new HashMap<>(); } @@ -989,13 +989,13 @@ public class EventGame extends Game if(Manager.GetEventModule().getDamagePlayers().contains(event.GetDamagerPlayer(true))) { - if(!Manager.GetGame().DamagePvP) + if(!Manager.GetGame().DamagePvP.GetOption()) { - Manager.GetGame().Damage = true; - Manager.GetGame().DamagePvP = true; + Manager.GetGame().Damage.SetOption(true); + Manager.GetGame().DamagePvP.SetOption(true); Bukkit.getPluginManager().callEvent(event); - Manager.GetGame().DamagePvP = false; - Manager.GetGame().Damage = false; + Manager.GetGame().DamagePvP.SetOption(false); + Manager.GetGame().Damage.SetOption(false); } return; } @@ -1032,13 +1032,13 @@ public class EventGame extends Game continue; } } - if(!Manager.GetGame().DamagePvP) + if(!Manager.GetGame().DamagePvP.GetOption()) { - Manager.GetGame().Damage = true; - Manager.GetGame().DamagePvP = true; + Manager.GetGame().Damage.SetOption(true); + Manager.GetGame().DamagePvP.SetOption(true); Bukkit.getPluginManager().callEvent(event); - Manager.GetGame().DamagePvP = false; - Manager.GetGame().Damage = false; + Manager.GetGame().DamagePvP.SetOption(false); + Manager.GetGame().Damage.SetOption(false); } } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java index 7f217d1e8..3b4843c60 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java @@ -456,11 +456,11 @@ public class EventModule extends MiniPlugin public void listSettings(Player player) { - UtilPlayer.message(player, F.value("Damage All", F.tf(Manager.GetGame().Damage))); - UtilPlayer.message(player, F.value("Damage PvP", F.tf(Manager.GetGame().DamagePvP))); - UtilPlayer.message(player, F.value("Damage PvE", F.tf(Manager.GetGame().DamagePvE))); - UtilPlayer.message(player, F.value("Damage EvP", F.tf(Manager.GetGame().DamageEvP))); - UtilPlayer.message(player, F.value("Damage Fall", F.tf(Manager.GetGame().DamageFall))); + UtilPlayer.message(player, F.value("Damage All", F.tf(Manager.GetGame().Damage.GetOption()))); + UtilPlayer.message(player, F.value("Damage PvP", F.tf(Manager.GetGame().DamagePvP.GetOption()))); + UtilPlayer.message(player, F.value("Damage PvE", F.tf(Manager.GetGame().DamagePvE.GetOption()))); + UtilPlayer.message(player, F.value("Damage EvP", F.tf(Manager.GetGame().DamageEvP.GetOption()))); + UtilPlayer.message(player, F.value("Damage Fall", F.tf(Manager.GetGame().DamageFall.GetOption()))); UtilPlayer.message(player, F.value("Health Set", Manager.GetGame().HealthSet+"")); UtilPlayer.message(player, F.value("Hunger Set", Manager.GetGame().HungerSet+"")); UtilPlayer.message(player, F.value("Item Pickup", F.tf(Manager.GetGame().ItemPickup))); @@ -468,11 +468,11 @@ public class EventModule extends MiniPlugin UtilPlayer.message(player, F.value("Block Place Creative", F.tf(Manager.GetGame().BlockPlaceCreative))); UtilPlayer.message(player, F.value("Block Break Creative", F.tf(Manager.GetGame().BlockBreakCreative))); UtilPlayer.message(player, F.value("Block Place", F.tf(Manager.GetGame().BlockPlace))); - UtilPlayer.message(player, F.value("Block Place Whitelist", UtilText.listToString(Manager.GetGame().BlockPlaceAllow, true))); - UtilPlayer.message(player, F.value("Block Place Blacklist", UtilText.listToString(Manager.GetGame().BlockPlaceDeny, true))); - UtilPlayer.message(player, F.value("Block Break", F.tf(Manager.GetGame().BlockPlace))); - UtilPlayer.message(player, F.value("Block Break Whitelist", UtilText.listToString(Manager.GetGame().BlockBreakAllow, true))); - UtilPlayer.message(player, F.value("Block Break Blacklist", UtilText.listToString(Manager.GetGame().BlockBreakDeny, true))); + UtilPlayer.message(player, F.value("Block Place Whitelist", UtilText.listToString(Manager.GetGame().BlockPlaceAllow.GetOption(), true))); + UtilPlayer.message(player, F.value("Block Place Blacklist", UtilText.listToString(Manager.GetGame().BlockPlaceDeny.GetOption(), true))); + UtilPlayer.message(player, F.value("Block Break", F.tf(Manager.GetGame().BlockPlace.GetOption()))); + UtilPlayer.message(player, F.value("Block Break Whitelist", UtilText.listToString(Manager.GetGame().BlockBreakAllow.GetOption(), true))); + UtilPlayer.message(player, F.value("Block Break Blacklist", UtilText.listToString(Manager.GetGame().BlockBreakDeny.G, true))); UtilPlayer.message(player, F.value("Time Set", Manager.GetGame().WorldTimeSet+"")); UtilPlayer.message(player, F.value("Mob griefing", F.tf(_mobGriefing))); } @@ -535,44 +535,44 @@ public class EventModule extends MiniPlugin { if (command.equalsIgnoreCase("add")) { - Manager.GetGame().BlockPlaceAllow.add(blockId); + Manager.GetGame().BlockPlaceAllow.GetOption().add(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Added " + blockId))); } else if (command.equalsIgnoreCase("remove")) { - Manager.GetGame().BlockPlaceAllow.remove(blockId); + Manager.GetGame().BlockPlaceAllow.GetOption().remove(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Removed " + blockId))); } else if (command.equalsIgnoreCase("clear")) { - Manager.GetGame().BlockPlaceAllow.clear(); + Manager.GetGame().BlockPlaceAllow.GetOption().clear(); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", "Cleared"))); } else if (command.equalsIgnoreCase("list")) { - UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", UtilText.listToString(Manager.GetGame().BlockPlaceAllow, true)))); + UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Whitelist", UtilText.listToString(Manager.GetGame().BlockPlaceAllow.GetOption(), true)))); } } else { if (command.equalsIgnoreCase("add")) { - Manager.GetGame().BlockPlaceDeny.add(blockId); + Manager.GetGame().BlockPlaceDeny.GetOption().add(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Added " + blockId))); } else if (command.equalsIgnoreCase("remove")) { - Manager.GetGame().BlockPlaceDeny.remove(blockId); + Manager.GetGame().BlockPlaceDeny.GetOption().remove(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Removed " + blockId))); } else if (command.equalsIgnoreCase("clear")) { - Manager.GetGame().BlockPlaceDeny.clear(); + Manager.GetGame().BlockPlaceDeny.GetOption().clear(); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", "Cleared"))); } else if (command.equalsIgnoreCase("list")) { - UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", UtilText.listToString(Manager.GetGame().BlockPlaceDeny, true)))); + UtilPlayer.message(player, F.main("Event Settings", F.value("Block Place Blacklist", UtilText.listToString(Manager.GetGame().BlockPlaceDeny.GetOption(), true)))); } } @@ -596,44 +596,44 @@ public class EventModule extends MiniPlugin { if (command.equalsIgnoreCase("add")) { - Manager.GetGame().BlockBreakAllow.add(blockId); + Manager.GetGame().BlockBreakAllow.GetOption().add(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Added " + blockId))); } else if (command.equalsIgnoreCase("remove")) { - Manager.GetGame().BlockBreakAllow.remove(blockId); + Manager.GetGame().BlockBreakAllow.GetOption().remove(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Removed " + blockId))); } else if (command.equalsIgnoreCase("clear")) { - Manager.GetGame().BlockBreakAllow.clear(); + Manager.GetGame().BlockBreakAllow.GetOption().clear(); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", "Cleared"))); } else if (command.equalsIgnoreCase("list")) { - UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", UtilText.listToString(Manager.GetGame().BlockBreakAllow, true)))); + UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Whitelist", UtilText.listToString(Manager.GetGame().BlockBreakAllow.GetOption(), true)))); } } else { if (command.equalsIgnoreCase("add")) { - Manager.GetGame().BlockBreakDeny.add(blockId); + Manager.GetGame().BlockBreakDeny.GetOption().add(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Added " + blockId))); } else if (command.equalsIgnoreCase("remove")) { - Manager.GetGame().BlockBreakDeny.remove(blockId); + Manager.GetGame().BlockBreakDeny.GetOption().remove(blockId); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Removed " + blockId))); } else if (command.equalsIgnoreCase("clear")) { - Manager.GetGame().BlockBreakDeny.clear(); + Manager.GetGame().BlockBreakDeny.GetOption().clear(); UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", "Cleared"))); } else if (command.equalsIgnoreCase("list")) { - UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", UtilText.listToString(Manager.GetGame().BlockBreakDeny, true)))); + UtilPlayer.message(player, F.main("Event Settings", F.value("Block Break Blacklist", UtilText.listToString(Manager.GetGame().BlockBreakDeny.GetOption(), true)))); } } @@ -660,7 +660,7 @@ public class EventModule extends MiniPlugin if (health > 20) health = 20; - Manager.GetGame().HealthSet = health; + Manager.GetGame().HealthSet.SetOption(health); if (Manager.GetGame().HealthSet.GetOption() == -1) Manager.GetGame().Announce(F.main("Event Settings", F.value("Health Set", "Disabled"))); @@ -691,7 +691,7 @@ public class EventModule extends MiniPlugin if (hunger > 20) hunger = 20; - Manager.GetGame().HungerSet = hunger; + Manager.GetGame().HungerSet.SetOption(hunger); if (Manager.GetGame().HungerSet.GetOption() == -1) Manager.GetGame().Announce(F.main("Event Settings", F.value("Hunger Set", "Disabled"))); @@ -722,7 +722,7 @@ public class EventModule extends MiniPlugin if (time > 24000) time = 24000; - Manager.GetGame().WorldTimeSet = time; + Manager.GetGame().WorldTimeSet.SetOption(time); if (Manager.GetGame().WorldTimeSet.GetOption() == -1) Manager.GetGame().Announce(F.main("Event Settings", F.value("Time Set", "Disabled"))); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/CreatureBase.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/CreatureBase.java index fb4b3232c..da4bc9547 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/CreatureBase.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/creatures/CreatureBase.java @@ -28,7 +28,7 @@ public abstract class CreatureBase Host = game; _name = name; - game.CreatureAllowOverride = true; + game.CreatureAllowOverride.SetOption(true); _ent = loc.getWorld().spawn(loc, mobClass); @@ -40,7 +40,7 @@ public abstract class CreatureBase SpawnCustom(_ent); - game.CreatureAllowOverride = false; + game.CreatureAllowOverride.SetOption(false); } public abstract void SpawnCustom(T ent); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java index 93d9bb2bd..3c4e6a2fb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java @@ -92,28 +92,28 @@ public class BombLobbers extends TeamGame implements IThrown "Last team alive wins!" }); - DamageFall = true; - DamageEvP = true; + DamageFall.SetOption(true); + DamageEvP.SetOption(true); - WorldWaterDamage = 5; + WorldWaterDamage.SetOption(5); - PrepareFreeze = false; + PrepareFreeze.SetOption(false); TeamArmor = true; TeamArmorHotbar = true; - InventoryOpenChest = false; - InventoryOpenBlock = false; + InventoryOpenChest.SetOption(false); + InventoryOpenBlock.SetOption(false); - ItemDrop = false; + ItemDrop.SetOption(false); - BlockPlace = false; + BlockPlace.SetOption(false); Manager.GetExplosion().SetLiquidDamage(false); - HungerSet = 20; + HungerSet.SetOption(20); - WorldTimeSet = 6000; + WorldTimeSet.SetOption(6000); registerStatTrackers( new Tracker6Kill(this), @@ -140,7 +140,7 @@ public class BombLobbers extends TeamGame implements IThrown if (WorldData.MapName.equalsIgnoreCase("Intergalactic")) { - WorldTimeSet = 18000; + WorldTimeSet.SetOption(18000); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java index c472b72f3..8a460e007 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeDragonEgg.java @@ -81,7 +81,7 @@ public class ChallengeDragonEgg extends Challenge block.getLocation().add(0.5, 0.5, 0.5), 0.5F, 0.5F, 0.5F, 0, 11, ViewDist.MAX, UtilServer.getPlayers()); - Host.CreatureAllowOverride = true; + Host.CreatureAllowOverride.SetOption(true); for (int i = 0; i < 10; i++) { @@ -106,7 +106,7 @@ public class ChallengeDragonEgg extends Challenge } } - Host.CreatureAllowOverride = false; + Host.CreatureAllowOverride.SetOption(false); Player player = event.getPlayer(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeHitTargets.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeHitTargets.java index fbb0f7dd4..265262f79 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeHitTargets.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeHitTargets.java @@ -100,13 +100,13 @@ public class ChallengeHitTargets extends Challenge @Override public void cleanupRoom() { - Host.DamagePvP = false; + Host.DamagePvP.SetOption(false); } @Override public void setupPlayers() { - Host.DamagePvP = true; + Host.DamagePvP.SetOption(true); ArrayList players = getChallengers(); for (Player player : players) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeMilkACow.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeMilkACow.java index 2ce37789a..69d03e553 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeMilkACow.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeMilkACow.java @@ -126,7 +126,7 @@ public class ChallengeMilkACow extends Challenge } } - Host.CreatureAllowOverride = true; + Host.CreatureAllowOverride.SetOption(true); _villager = (Villager) getCenter().getWorld().spawnEntity(getCenter().clone().add(0, 1, 0), EntityType.VILLAGER); _villager.setProfession(Profession.FARMER); _villager.setCustomName(C.Bold + "Farmer Joe"); @@ -156,7 +156,7 @@ public class ChallengeMilkACow extends Challenge _milked.put(cow, new ArrayList()); } - Host.CreatureAllowOverride = false; + Host.CreatureAllowOverride.SetOption(false); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeNameThatSound.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeNameThatSound.java index 1b84f183d..2c5b97c65 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeNameThatSound.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeNameThatSound.java @@ -184,7 +184,7 @@ public class ChallengeNameThatSound extends ChallengeSeperateRooms Collections.shuffle(entityType); - Host.CreatureAllowOverride = true; + Host.CreatureAllowOverride.SetOption(true); int i = 0; @@ -205,7 +205,7 @@ public class ChallengeNameThatSound extends ChallengeSeperateRooms } } - Host.CreatureAllowOverride = false; + Host.CreatureAllowOverride.SetOption(false); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeShootChickens.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeShootChickens.java index 5bf0b4bab..18daa31ed 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeShootChickens.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeShootChickens.java @@ -52,7 +52,7 @@ public class ChallengeShootChickens extends Challenge arrow.remove(); } - Host.DamagePvE = false; + Host.DamagePvE.SetOption(false); } @EventHandler @@ -140,9 +140,9 @@ public class ChallengeShootChickens extends Challenge { Location loc = getCenter().clone().add(UtilMath.r(20) - 10, 15, UtilMath.r(20) - 10); - Host.CreatureAllowOverride = true; + Host.CreatureAllowOverride.SetOption(true); Chicken chicken = (Chicken) loc.getWorld().spawnEntity(loc, EntityType.CHICKEN); - Host.CreatureAllowOverride = false; + Host.CreatureAllowOverride.SetOption(false); chicken.setMaxHealth(0.1); chicken.setHealth(0.1); @@ -164,7 +164,7 @@ public class ChallengeShootChickens extends Challenge _killedChickens.put(player.getName(), 0); } - Host.DamagePvE = true; + Host.DamagePvE.SetOption(true); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSkyFall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSkyFall.java index 1408f1d2d..921cf46d2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSkyFall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSkyFall.java @@ -42,7 +42,7 @@ public class ChallengeSkyFall extends Challenge @Override public void cleanupRoom() { - Host.DamageEvP = false; + Host.DamageEvP.SetOption(false); } @EventHandler @@ -66,7 +66,7 @@ public class ChallengeSkyFall extends Challenge { setBorder(-50, 50, 0, 254, -50, 50); - Host.DamageEvP = true; + Host.DamageEvP.SetOption(true); for (Player player : getChallengers()) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSmashOff.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSmashOff.java index 7527e633b..709380e3d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSmashOff.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeSmashOff.java @@ -29,7 +29,7 @@ public class ChallengeSmashOff extends Challenge @Override public void cleanupRoom() { - Host.DamagePvP = false; + Host.DamagePvP.SetOption(false); for (Player player : getChallengers()) { @@ -40,7 +40,7 @@ public class ChallengeSmashOff extends Challenge @Override public void setupPlayers() { - Host.DamagePvP = true; + Host.DamagePvP.SetOption(true); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeTntLauncher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeTntLauncher.java index d7879a713..1bb879edb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeTntLauncher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeTntLauncher.java @@ -46,7 +46,7 @@ public class ChallengeTntLauncher extends Challenge @Override public void cleanupRoom() { - Host.Damage = true; + Host.Damage.SetOption(true); for (Entity tnt : _tnt) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java index ce69eba1f..c8353412f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeVolleyPig.java @@ -62,7 +62,7 @@ public class ChallengeVolleyPig extends Challenge public void cleanupRoom() { _pig.remove(); - Host.DamagePvE = false; + Host.DamagePvE.SetOption(false); } @Override @@ -73,7 +73,7 @@ public class ChallengeVolleyPig extends Challenge player.getInventory().setItem(0, new ItemBuilder(Material.STICK).addEnchantment(Enchantment.KNOCKBACK, 1).build()); } - Host.DamagePvE = true; + Host.DamagePvE.SetOption(true); } @EventHandler(priority = EventPriority.LOW) @@ -203,12 +203,12 @@ public class ChallengeVolleyPig extends Challenge @Override public void generateRoom() { - Host.CreatureAllowOverride = true; + Host.CreatureAllowOverride.SetOption(true); _pig = getCenter().getWorld().spawnEntity(getCenter().add(0, 1, 0), EntityType.PIG); UtilEnt.Vegetate(_pig); - Host.CreatureAllowOverride = false; + Host.CreatureAllowOverride.SetOption(false); for (int x = -6; x <= 6; x++) {