From fea88227801e54996d1b4cce9462c7ada44be668 Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Thu, 2 Nov 2017 02:22:06 -0400 Subject: [PATCH] Bye bye halloween --- .../src/mineplex/hub/HubManager.java | 19 ++++++++----------- .../nautilus/game/arcade/ArcadeManager.java | 2 +- .../game/arcade/game/games/build/Build.java | 2 +- .../game/arcade/game/games/draw/Draw.java | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 6c6f182ad..74e8d36c8 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -2,13 +2,6 @@ package mineplex.hub; import java.util.UUID; -import net.md_5.bungee.api.chat.ComponentBuilder; -import net.md_5.bungee.api.chat.HoverEvent; -import net.md_5.bungee.api.chat.HoverEvent.Action; -import net.md_5.bungee.api.chat.TextComponent; -import net.minecraft.server.v1_8_R3.EntityInsentient; -import net.minecraft.server.v1_8_R3.EntityPlayer; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -95,13 +88,18 @@ import mineplex.hub.modules.salesannouncements.SalesAnnouncementManager; import mineplex.hub.news.NewsManager; import mineplex.hub.player.CreativeManager; import mineplex.hub.player.HubPlayerManager; -import mineplex.hub.plugin.HalloweenHubPlugin; import mineplex.hub.plugin.HubPlugin; import mineplex.hub.scoreboard.HubScoreboard; import mineplex.hub.world.HubWorldManager; import mineplex.hub.world.WorldDataModule; import mineplex.minecraft.game.core.combat.DeathMessageType; import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.HoverEvent.Action; +import net.md_5.bungee.api.chat.TextComponent; +import net.minecraft.server.v1_8_R3.EntityInsentient; +import net.minecraft.server.v1_8_R3.EntityPlayer; public class HubManager extends MiniClientPlugin implements IChatMessageFormatter { @@ -196,7 +194,7 @@ public class HubManager extends MiniClientPlugin implements IChatMess new NotificationManager(getPlugin(), clientManager); new BotSpamManager(_plugin, clientManager, punish); - new MusicManager((player) -> _preferences.get(player).isActive(Preference.HUB_MUSIC), "../../update/songs/lobbyMusicHalloween"); + new MusicManager((player) -> _preferences.get(player).isActive(Preference.HUB_MUSIC), "../../update/songs/lobbyMusic"); require(PlayerDisguiseManager.class); @@ -224,8 +222,7 @@ public class HubManager extends MiniClientPlugin implements IChatMess //require(StaffBuild.class); //require(HubPortalManager.class); - _hubPlugin = new HalloweenHubPlugin(); - //_hubPlugin = new HubPlugin(); + _hubPlugin = new HubPlugin(); generatePermissions(); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index ed1daa13c..62cdd65b4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -359,7 +359,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation TitanGiveawayManager titanGiveaway = new TitanGiveawayManager(getPlugin(), clientManager, serverStatusManager); EternalGiveawayManager eternalGiveawayManager = new EternalGiveawayManager(getPlugin(), clientManager, serverStatusManager); - new HolidayManager(this, titanGiveaway, eternalGiveawayManager); + //new HolidayManager(this, titanGiveaway, eternalGiveawayManager); //new ValentinesGiftManager(plugin, clientManager, _bonusManager.getRewardManager(), inventoryManager, _cosmeticManager.getGadgetManager(), statsManager); require(PlayerDisguiseManager.class); 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 07ac46570..148bba1e0 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 @@ -133,7 +133,7 @@ public class Build extends Game protected String[] _christmasWords; protected String[] _halloweenWords; protected boolean _useChristmasWords = false; - protected boolean _useHalloweenWords = true; + protected boolean _useHalloweenWords = false; protected String _word = "?"; 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 6258083e4..43e8de9d6 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 @@ -97,7 +97,7 @@ public class Draw extends SoloGame private String[] _christmasWords; private String[] _halloweenWords; private boolean _useChristmasWords = false; - private boolean _useHalloweenWords = true; + private boolean _useHalloweenWords = false; private HashSet _usedWords = new HashSet(); public Draw(ArcadeManager manager)