From 3533ce1b7e81e0fd51968d3f58f6aad910b2566f Mon Sep 17 00:00:00 2001 From: Chiss Date: Sun, 10 Aug 2014 01:04:53 +1000 Subject: [PATCH] Particles dont play in stealth games. --- .../src/mineplex/core/cosmetic/CosmeticManager.java | 5 +++++ .../src/mineplex/core/gadget/GadgetManager.java | 12 ++++++++++++ .../core/gadget/gadgets/ParticleEnchant.java | 2 +- .../core/gadget/gadgets/ParticleFireRings.java | 2 +- .../mineplex/core/gadget/gadgets/ParticleFoot.java | 2 +- .../mineplex/core/gadget/gadgets/ParticleGreen.java | 2 +- .../mineplex/core/gadget/gadgets/ParticleHelix.java | 2 +- .../mineplex/core/gadget/gadgets/ParticleRain.java | 2 +- .../mineplex/core/gadget/types/ParticleGadget.java | 12 ++++++++++++ .../game/arcade/game/games/hideseek/HideSeek.java | 1 + .../game/games/sneakyassassins/SneakyAssassins.java | 2 ++ .../game/arcade/managers/GameCreationManager.java | 1 + 12 files changed, 39 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java index d8056e204..6391ff228 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/CosmeticManager.java @@ -151,4 +151,9 @@ public class CosmeticManager extends MiniPlugin _mountManager.DisableAll(); _petManager.DisableAll(); } + + public void setHideParticles(boolean b) + { + _gadgetManager.setHideParticles(b); + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java index d16dd3f54..d7397aab7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java @@ -49,6 +49,8 @@ public class GadgetManager extends MiniPlugin private NautHashMap _lastMove = new NautHashMap(); private NautHashMap> _playerActiveGadgetMap = new NautHashMap>(); + + private boolean _hideParticles = false; public GadgetManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager, MountManager mountManager, PetManager petManager, PreferencesManager preferencesManager, @@ -310,4 +312,14 @@ public class GadgetManager extends MiniPlugin _playerActiveGadgetMap.get(player).remove(gadget.getGadgetType()); } + + public void setHideParticles(boolean b) + { + _hideParticles = b; + } + + public boolean hideParticles() + { + return _hideParticles; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleEnchant.java index 65093a67e..e3926da5a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleEnchant.java @@ -36,7 +36,7 @@ public class ParticleEnchant extends ParticleGadget for (Player player : GetActive()) { - if (player.getGameMode() != GameMode.SURVIVAL) + if (shouldDisplay(player)) continue; if (Manager.isMoving(player)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFireRings.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFireRings.java index fce05117c..75ff2c25a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFireRings.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFireRings.java @@ -37,7 +37,7 @@ public class ParticleFireRings extends ParticleGadget for (Player player : GetActive()) { - if (player.getGameMode() != GameMode.SURVIVAL) + if (shouldDisplay(player)) continue; if (Manager.isMoving(player)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFoot.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFoot.java index 792910202..3d9ffe2ab 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFoot.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleFoot.java @@ -55,7 +55,7 @@ public class ParticleFoot extends ParticleGadget for (Player player : GetActive()) { - if (player.getGameMode() != GameMode.SURVIVAL) + if (shouldDisplay(player)) continue; if (!Manager.isMoving(player)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleGreen.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleGreen.java index 9910937a4..a3ce3416b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleGreen.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleGreen.java @@ -37,7 +37,7 @@ public class ParticleGreen extends ParticleGadget for (Player player : GetActive()) { - if (player.getGameMode() != GameMode.SURVIVAL) + if (shouldDisplay(player)) continue; if (Manager.isMoving(player)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleHelix.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleHelix.java index b61f6ed0b..0d3e4116f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleHelix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleHelix.java @@ -37,7 +37,7 @@ public class ParticleHelix extends ParticleGadget for (Player player : GetActive()) { - if (player.getGameMode() != GameMode.SURVIVAL) + if (shouldDisplay(player)) continue; if (Manager.isMoving(player)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleRain.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleRain.java index 35b91b818..8f64b32c4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleRain.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ParticleRain.java @@ -38,7 +38,7 @@ public class ParticleRain extends ParticleGadget for (Player player : GetActive()) { - if (player.getGameMode() != GameMode.SURVIVAL) + if (shouldDisplay(player)) continue; if (Manager.isMoving(player)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java index ae30db1f5..b529a18ea 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java @@ -1,5 +1,6 @@ package mineplex.core.gadget.types; +import org.bukkit.GameMode; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -30,4 +31,15 @@ public abstract class ParticleGadget extends Gadget if (_active.remove(player)) UtilPlayer.message(player, F.main("Gadget", "You unsummoned " + F.elem(GetName()) + ".")); } + + public boolean shouldDisplay(Player player) + { + if (player.getGameMode() != GameMode.SURVIVAL) + return false; + + if (Manager.hideParticles()) + return false; + + return true; + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index a01a09dd9..01acc66d9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -149,6 +149,7 @@ public class HideSeek extends TeamGame Manager.GetExplosion().SetRegenerate(true); Manager.GetExplosion().SetTNTSpread(false); + Manager.getCosmeticManager().setHideParticles(true); } public Material GetItemEquivilent(Material mat) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java index e5b95272d..048b9bfa5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java @@ -70,6 +70,8 @@ public class SneakyAssassins extends SoloGame this.CompassEnabled = true; this.CompassGiveItem = false; + + Manager.getCosmeticManager().setHideParticles(true); } @Override 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 2e149ed61..e91e835bc 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 @@ -151,6 +151,7 @@ public class GameCreationManager implements Listener Manager.GetExplosion().SetRegenerate(false); Manager.GetExplosion().SetTNTSpread(true); Manager.GetAntiStack().SetEnabled(true); + Manager.getCosmeticManager().setHideParticles(false); HashMap pastTeams = null;