From 43c58bd31c837dbe17923c2f0e795248eb37ed3d Mon Sep 17 00:00:00 2001 From: Cheese Date: Wed, 1 Apr 2015 20:22:13 +1100 Subject: [PATCH] removed april fools from arcade :( --- .../src/nautilus/game/arcade/Arcade.java | 3 --- .../src/nautilus/game/arcade/ArcadeManager.java | 9 --------- .../nautilus/game/arcade/game/games/bridge/Bridge.java | 3 --- .../arcade/game/games/champions/ChampionsDominate.java | 5 +---- .../game/arcade/game/games/champions/ChampionsTDM.java | 5 +---- .../src/nautilus/game/arcade/game/games/micro/Micro.java | 6 ------ .../game/arcade/game/games/minestrike/MineStrike.java | 3 --- .../game/arcade/game/games/paintball/Paintball.java | 6 +----- .../nautilus/game/arcade/game/games/sheep/SheepGame.java | 3 --- .../nautilus/game/arcade/managers/GameChatManager.java | 5 ----- .../game/arcade/managers/GameCreationManager.java | 4 +--- 11 files changed, 4 insertions(+), 48 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index b4e166f6b..ae9ca9b08 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -10,7 +10,6 @@ import mineplex.core.CustomTagFix; import mineplex.core.TablistFix; import mineplex.core.account.CoreClientManager; import mineplex.core.antihack.AntiHack; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.blood.Blood; import mineplex.core.command.CommandCenter; @@ -136,8 +135,6 @@ public class Arcade extends JavaPlugin new CustomTagFix(this, packetHandler); new TablistFix(this); - AprilFoolsManager.Initialize(this, _clientManager, disguiseManager); - //Updates getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1); 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 043772964..3c710989d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -33,7 +33,6 @@ import org.bukkit.util.Vector; import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.blood.Blood; import mineplex.core.chat.Chat; @@ -605,10 +604,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation { String name = event.getPlayer().getName(); - // April Fools - if (AprilFoolsManager.Instance.isActive()) - name = AprilFoolsManager.Instance.getName(event.getPlayer()); - if (_game != null && _game.AnnounceJoinQuit) event.setJoinMessage(F.sys("Join", GetColor(event.getPlayer()) + name)); @@ -621,10 +616,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation { String name = event.getPlayer().getName(); - // April Fools - if (AprilFoolsManager.Instance.isActive()) - name = AprilFoolsManager.Instance.getName(event.getPlayer()); - if (_game == null || _game.AnnounceJoinQuit) event.setQuitMessage(F.sys("Quit", GetColor(event.getPlayer()) + name)); else 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 60e750aac..fc9b5e983 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 @@ -38,7 +38,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.util.Vector; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilBlock; @@ -145,8 +144,6 @@ public class Bridge extends TeamGame implements OreObsfucation "The last team alive wins!" }); - AprilFoolsManager.Instance.setEnabled(false); - _ore = new OreHider(); // Flags 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 45bc2644d..2066d9589 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 @@ -1,6 +1,5 @@ package nautilus.game.arcade.game.games.champions; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.minecraft.game.core.combat.DeathMessageType; @@ -54,9 +53,7 @@ public class ChampionsDominate extends Domination "Diamond Weapons deal 7 damage", }; - - AprilFoolsManager.Instance.setEnabled(false); - + Manager.GetDamage().UseSimpleWeaponDamage = false; Manager.getCosmeticManager().setHideParticles(true); 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 045412b82..505ca592e 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 @@ -6,7 +6,6 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityShootBowEvent; import org.bukkit.event.inventory.InventoryType; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.minecraft.game.core.combat.DeathMessageType; @@ -55,9 +54,7 @@ public class ChampionsTDM extends TeamDeathmatch "Diamond Weapons deal 7 damage", }; - - AprilFoolsManager.Instance.setEnabled(false); - + this.Manager.GetDamage().UseSimpleWeaponDamage = false; Manager.getCosmeticManager().setHideParticles(true); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java index 135df7768..e35832f40 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/Micro.java @@ -9,14 +9,10 @@ import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockPlaceEvent; -import mineplex.core.aprilfools.AprilFoolsManager; -import mineplex.core.common.util.C; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilTime; -import mineplex.core.timing.TimingManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.minecraft.game.core.damage.CustomDamageEvent; @@ -48,8 +44,6 @@ public class Micro extends TeamGame "Small game, big strategy!", }); - AprilFoolsManager.Instance.setEnabled(false); - this.StrictAntiHack = true; this.TeamArmor = true; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index 01289e8ae..0116237ea 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -57,7 +57,6 @@ import org.bukkit.scoreboard.Team; import org.bukkit.scoreboard.TeamNameTagVisibility; import org.bukkit.util.Vector; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAction; @@ -249,8 +248,6 @@ public class MineStrike extends TeamGame C.cRed + "Al'Jaha" + C.cWhite + " Kill the Counter-Terrorists", }); - AprilFoolsManager.Instance.setEnabled(false); - _shopManager = new ShopManager(this); this.StrictAntiHack = true; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java index 840f210d3..75982a00d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/Paintball.java @@ -34,7 +34,6 @@ import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilMath; @@ -43,7 +42,6 @@ import mineplex.core.common.util.UtilServer; import mineplex.minecraft.game.core.condition.Condition.ConditionType; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.core.visibility.VisibilityManager; import mineplex.minecraft.game.core.damage.CustomDamageEvent; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; @@ -111,9 +109,7 @@ public class Paintball extends TeamGame "Revive/heal with Water Bombs", "Last team alive wins!" }); - - AprilFoolsManager.Instance.setEnabled(false); - + this.StrictAntiHack = true; this.HungerSet = 20; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java index 4cb753d7f..b00875e7b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/SheepGame.java @@ -29,7 +29,6 @@ import org.bukkit.event.player.PlayerEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerItemHeldEvent; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAlg; @@ -142,8 +141,6 @@ public class SheepGame extends TeamGame "Most sheep at 5 minutes wins!" }); - AprilFoolsManager.Instance.setEnabled(false); - this.DeathOut = false; this.DeathSpectateSecs = 6; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java index 0bebbb2c1..0f8f37712 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java @@ -2,7 +2,6 @@ package nautilus.game.arcade.managers; import java.util.Iterator; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -49,10 +48,6 @@ public class GameChatManager implements Listener Player sender = event.getPlayer(); String senderName = sender.getName(); - // April Fools - if (AprilFoolsManager.Instance.isActive()) - senderName = AprilFoolsManager.Instance.getName(sender); - //Dead Prefix String dead = ""; if (Manager.GetGame() != null) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java index b67c1e474..2337f1f77 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTime; @@ -164,8 +163,7 @@ public class GameCreationManager implements Listener // Manager.GetAntiStack().SetEnabled(true); Manager.getCosmeticManager().setHideParticles(false); Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName); - AprilFoolsManager.Instance.setEnabled(true); - + HashMap pastTeams = null; //Chosen Game