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

Bye bye halloween

Browse Source
This commit is contained in:
AlexTheCoder 2017-11-02 02:22:06 -04:00
parent 6331ad68e5
commit fea8822780
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -2,13 +2,6 @@ package mineplex.hub;
import java.util.UUID; 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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
@ -95,13 +88,18 @@ import mineplex.hub.modules.salesannouncements.SalesAnnouncementManager;
import mineplex.hub.news.NewsManager; import mineplex.hub.news.NewsManager;
import mineplex.hub.player.CreativeManager; import mineplex.hub.player.CreativeManager;
import mineplex.hub.player.HubPlayerManager; import mineplex.hub.player.HubPlayerManager;
import mineplex.hub.plugin.HalloweenHubPlugin;
import mineplex.hub.plugin.HubPlugin; import mineplex.hub.plugin.HubPlugin;
import mineplex.hub.scoreboard.HubScoreboard; import mineplex.hub.scoreboard.HubScoreboard;
import mineplex.hub.world.HubWorldManager; import mineplex.hub.world.HubWorldManager;
import mineplex.hub.world.WorldDataModule; import mineplex.hub.world.WorldDataModule;
import mineplex.minecraft.game.core.combat.DeathMessageType; import mineplex.minecraft.game.core.combat.DeathMessageType;
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; 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<HubClient> implements IChatMessageFormatter public class HubManager extends MiniClientPlugin<HubClient> implements IChatMessageFormatter
{ {
@ -196,7 +194,7 @@ public class HubManager extends MiniClientPlugin<HubClient> implements IChatMess
new NotificationManager(getPlugin(), clientManager); new NotificationManager(getPlugin(), clientManager);
new BotSpamManager(_plugin, clientManager, punish); 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); require(PlayerDisguiseManager.class);
@ -224,8 +222,7 @@ public class HubManager extends MiniClientPlugin<HubClient> implements IChatMess
//require(StaffBuild.class); //require(StaffBuild.class);
//require(HubPortalManager.class); //require(HubPortalManager.class);
_hubPlugin = new HalloweenHubPlugin(); _hubPlugin = new HubPlugin();
//_hubPlugin = new HubPlugin();
generatePermissions(); generatePermissions();
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -359,7 +359,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
TitanGiveawayManager titanGiveaway = new TitanGiveawayManager(getPlugin(), clientManager, serverStatusManager); TitanGiveawayManager titanGiveaway = new TitanGiveawayManager(getPlugin(), clientManager, serverStatusManager);
EternalGiveawayManager eternalGiveawayManager = new EternalGiveawayManager(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); //new ValentinesGiftManager(plugin, clientManager, _bonusManager.getRewardManager(), inventoryManager, _cosmeticManager.getGadgetManager(), statsManager);
require(PlayerDisguiseManager.class); require(PlayerDisguiseManager.class);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
View File

@ -133,7 +133,7 @@ public class Build extends Game
protected String[] _christmasWords; protected String[] _christmasWords;
protected String[] _halloweenWords; protected String[] _halloweenWords;
protected boolean _useChristmasWords = false; protected boolean _useChristmasWords = false;
protected boolean _useHalloweenWords = true; protected boolean _useHalloweenWords = false;
protected String _word = "?"; protected String _word = "?";

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
View File

@ -97,7 +97,7 @@ public class Draw extends SoloGame
private String[] _christmasWords; private String[] _christmasWords;
private String[] _halloweenWords; private String[] _halloweenWords;
private boolean _useChristmasWords = false; private boolean _useChristmasWords = false;
private boolean _useHalloweenWords = true; private boolean _useHalloweenWords = false;
private HashSet<String> _usedWords = new HashSet<String>(); private HashSet<String> _usedWords = new HashSet<String>();
public Draw(ArcadeManager manager) public Draw(ArcadeManager manager)