From 9afa829f89b77ae5c4c6ab79342b47d010d1b391 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Tue, 21 Mar 2017 15:56:05 -0300 Subject: [PATCH 01/91] Created new gadget item for PPC --- .../fountain/GemFountainSalesPackage.java | 6 +- .../mineplex/core/gadget/GadgetManager.java | 2 + .../mineplex/core/gadget/gadgets/Ammo.java | 10 +- .../arrowtrail/freedom/ArrowTrailFreedom.java | 2 +- .../arrowtrail/titan/ArrowTrailTitan.java | 4 +- .../gadgets/death/titan/DeathTitan.java | 4 +- .../doublejump/titan/DoubleJumpTitan.java | 4 +- .../gamemodifiers/kits/KitGameModifier.java | 2 +- .../GameModifierMineStrikeSkin.java | 2 +- .../core/gadget/gadgets/item/ItemBatGun.java | 25 +++-- .../core/gadget/gadgets/item/ItemBow.java | 4 +- .../gadgets/item/ItemBubbleBlaster.java | 103 ++++++++++++++++++ .../core/gadget/gadgets/item/ItemCoal.java | 47 ++++---- .../gadget/gadgets/item/ItemCoinBomb.java | 2 +- .../gadget/gadgets/item/ItemDuelingSword.java | 4 +- .../gadget/gadgets/item/ItemFleshHook.java | 4 +- .../gadget/gadgets/item/ItemFreezeCannon.java | 8 +- .../gadget/gadgets/item/ItemLovePotion.java | 14 +-- .../gadgets/item/ItemMelonLauncher.java | 2 +- .../gadget/gadgets/item/ItemPaintbrush.java | 8 +- .../gadget/gadgets/item/ItemSnowball.java | 2 +- .../core/gadget/gadgets/item/ItemTNT.java | 2 +- .../core/gadget/gadgets/morph/BlockForm.java | 12 +- .../core/gadget/gadgets/morph/MorphBat.java | 6 +- .../core/gadget/gadgets/morph/MorphBlaze.java | 8 +- .../core/gadget/gadgets/morph/MorphBunny.java | 10 +- .../gadget/gadgets/morph/MorphChicken.java | 4 +- .../gadgets/morph/MorphChristmasKing.java | 8 +- .../core/gadget/gadgets/morph/MorphCow.java | 4 +- .../gadget/gadgets/morph/MorphCreeper.java | 16 +-- .../gadget/gadgets/morph/MorphDinnerbone.java | 8 +- .../gadget/gadgets/morph/MorphEnderman.java | 4 +- .../gadget/gadgets/morph/MorphGoldPot.java | 6 +- .../gadget/gadgets/morph/MorphGrimReaper.java | 4 +- .../gadget/gadgets/morph/MorphLoveDoctor.java | 4 +- .../gadget/gadgets/morph/MorphMetalMan.java | 4 +- .../core/gadget/gadgets/morph/MorphPig.java | 10 +- .../gadgets/morph/MorphPumpkinKing.java | 12 +- .../core/gadget/gadgets/morph/MorphSanta.java | 12 +- .../core/gadget/gadgets/morph/MorphSlime.java | 4 +- .../gadget/gadgets/morph/MorphSnowman.java | 6 +- .../core/gadget/gadgets/morph/MorphSquid.java | 8 +- .../core/gadget/gadgets/morph/MorphStray.java | 6 +- .../core/gadget/gadgets/morph/MorphTitan.java | 18 +-- .../gadget/gadgets/morph/MorphTurkey.java | 4 +- .../gadget/gadgets/morph/MorphUncleSam.java | 4 +- .../gadget/gadgets/morph/MorphVillager.java | 14 +-- .../core/gadget/gadgets/morph/MorphWitch.java | 10 +- .../gadget/gadgets/morph/MorphWither.java | 14 +-- .../gadget/gadgets/outfit/OutfitTeam.java | 6 +- .../outfit/freezesuit/OutfitFreezeSuit.java | 10 +- .../particle/ParticleChristmasTree.java | 2 +- .../gadgets/particle/ParticleCoalFumes.java | 2 +- .../gadgets/particle/ParticleFireRings.java | 2 +- .../gadgets/particle/ParticleKronos.java | 6 +- .../gadgets/particle/ParticleLegend.java | 4 +- .../gadgets/particle/ParticleWingsAngel.java | 2 +- .../gadgets/particle/ParticleWingsDemons.java | 2 +- .../particle/ParticleWingsInfernal.java | 2 +- .../gadgets/particle/ParticleWingsLove.java | 2 +- .../gadgets/particle/ParticleWingsPixie.java | 2 +- .../gadgets/particle/ParticleYinYang.java | 2 +- .../particle/candycane/ParticleCandyCane.java | 2 +- .../particle/cupidslove/ParticleHeart.java | 2 +- .../particle/emerald/ParticleEmerald.java | 2 +- .../particle/freedom/ParticleFreedom.java | 2 +- .../particle/frostlord/ParticleFrostLord.java | 2 +- .../particle/howlingwinds/ParticleRain.java | 2 +- .../gadgets/particle/music/ParticleMusic.java | 4 +- .../particle/party/ParticlePartyTime.java | 4 +- .../gadgets/particle/shadow/ParticleFoot.java | 4 +- .../gadgets/particle/titan/ParticleTitan.java | 6 +- .../particle/vampire/ParticleBlood.java | 2 +- .../particle/wisdom/ParticleEnchant.java | 2 +- .../gadget/gadgets/taunts/EternalTaunt.java | 8 +- .../gadget/gadgets/taunts/RainbowTaunt.java | 2 +- .../wineffect/WinEffectBabyChicken.java | 2 +- .../gadgets/wineffect/WinEffectFireworks.java | 2 +- .../gadgets/wineffect/WinEffectFlames.java | 2 +- .../gadgets/wineffect/WinEffectHalloween.java | 4 +- .../wineffect/WinEffectLightningStrike.java | 2 +- .../WinEffectLoveIsABattlefield.java | 4 +- .../gadgets/wineffect/WinEffectPodium.java | 4 +- .../WinEffectRiseOfTheElderGuardian.java | 10 +- .../wineffect/WinEffectSnowTrails.java | 2 +- .../wineffect/WinEffectWinterWarfare.java | 2 +- .../core/gadget/types/ArrowEffectGadget.java | 4 +- .../core/gadget/types/BalloonGadget.java | 4 +- .../core/gadget/types/DeathEffectGadget.java | 2 +- .../gadget/types/DoubleJumpEffectGadget.java | 2 +- .../mineplex/core/gadget/types/Gadget.java | 50 ++++----- .../mineplex/core/gadget/types/HatGadget.java | 4 +- .../core/gadget/types/ItemGadget.java | 34 ++++-- .../core/gadget/types/MorphGadget.java | 2 +- .../core/gadget/types/MusicGadget.java | 2 +- .../core/gadget/types/OutfitGadget.java | 4 +- .../core/gadget/types/ParticleGadget.java | 4 +- .../core/gadget/types/WinEffectGadget.java | 8 +- .../src/mineplex/core/mount/DragonMount.java | 2 +- .../src/mineplex/core/mount/HorseMount.java | 4 +- .../mineplex/core/mount/types/MountCart.java | 2 +- .../mineplex/core/mount/types/MountSlime.java | 2 +- .../core/particleeffects/BlowAKissEffect.java | 2 +- .../particleeffects/LoveDoctorEffect.java | 4 +- .../core/particleeffects/MetalManEffect.java | 4 +- .../core/pet/sales/PetExtraSalesPackage.java | 6 +- .../core/pet/sales/PetSalesPackage.java | 4 +- .../core/shop/item/SalesPackageBase.java | 63 +++++------ .../mineplex/core/treasure/ChestPackage.java | 4 +- .../mineplex/core/treasure/TreasureKey.java | 4 +- .../goals/classes/SelectBullsChargeGoal.java | 2 +- .../src/mineplex/hub/modules/TextManager.java | 14 +-- .../shop/salespackage/ItemSalesPackage.java | 6 +- .../shop/salespackage/SkillSalesPackage.java | 6 +- .../game/core/condition/ConditionFactory.java | 2 +- .../arcade/game/games/event/EventGame.java | 2 +- .../games/evolution/mobs/KitSkeleton.java | 2 +- .../game/games/evolution/mobs/KitSnowman.java | 2 +- .../game/arcade/kit/perks/PerkDestructor.java | 2 +- .../game/arcade/kit/perks/PerkSquidRifle.java | 2 +- .../arcade/kit/perks/PerkSquidShotgun.java | 2 +- .../arcade/kit/perks/PerkSquidSniper.java | 2 +- .../nautilus/game/arcade/shop/KitPackage.java | 4 +- 123 files changed, 492 insertions(+), 380 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java index d0ba3e882..e34c8bac1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java @@ -13,8 +13,8 @@ public class GemFountainSalesPackage extends SalesPackageBase { super("Add " + gems + " Gems", Material.EMERALD, (byte) 0, new String[] {}, gems, 1); - CurrencyCostMap.put(GlobalCurrency.GEM, gems); - KnownPackage = false; - OneTimePurchaseOnly = false; + _currencyCostMap.put(GlobalCurrency.GEM, gems); + _knownPackage = false; + _oneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java index d2acbf740..55968b074 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java @@ -98,6 +98,7 @@ import mineplex.core.gadget.gadgets.hat.HatItem; import mineplex.core.gadget.gadgets.hat.HatType; import mineplex.core.gadget.gadgets.item.ItemBatGun; import mineplex.core.gadget.gadgets.item.ItemBow; +import mineplex.core.gadget.gadgets.item.ItemBubbleBlaster; import mineplex.core.gadget.gadgets.item.ItemCoal; import mineplex.core.gadget.gadgets.item.ItemCoinBomb; import mineplex.core.gadget.gadgets.item.ItemDuelingSword; @@ -360,6 +361,7 @@ public class GadgetManager extends MiniPlugin addGadget(new ItemBow(this)); addGadget(new ItemLovePotion(this)); addGadget(new ItemFlowerGift(this)); + addGadget(new ItemBubbleBlaster(this)); // Costume addGadget(new OutfitRaveSuitHelmet(this)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java index 4f6f3b421..366f34d4d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java @@ -1,16 +1,18 @@ package mineplex.core.gadget.gadgets; -import mineplex.core.shop.item.SalesPackageBase; import org.bukkit.Material; +import mineplex.core.shop.item.SalesPackageBase; + public class Ammo extends SalesPackageBase { public Ammo(String name, String displayName, Material material, byte displayData, String[] description, int coins, int quantity) { super(name, material, displayData, description, coins, quantity); - DisplayName = displayName; - KnownPackage = false; - OneTimePurchaseOnly = false; + _displayName = displayName; + _knownPackage = false; + _oneTimePurchaseOnly = false; + _free = coins == -5; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java index 8921b26cc..9641ef4e2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java @@ -58,7 +58,7 @@ public class ArrowTrailFreedom extends ArrowEffectGadget @Override public void doHitEffect(Arrow arrow) { - BabyFireworkEffect babyFireworkEffect = new BabyFireworkEffect(arrow.getLocation(), Manager.getPlugin(), _color); + BabyFireworkEffect babyFireworkEffect = new BabyFireworkEffect(arrow.getLocation(), _manager.getPlugin(), _color); babyFireworkEffect.start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java index 956055929..ed3c9b54f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java @@ -43,9 +43,9 @@ public class ArrowTrailTitan extends ArrowEffectGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java index 00b64eace..f116b5d65 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java @@ -32,9 +32,9 @@ public class DeathTitan extends DeathEffectGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java index 336aaa5bc..f24d33720 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java @@ -37,9 +37,9 @@ public class DoubleJumpTitan extends DoubleJumpEffectGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java index d06bffbe8..28bf3f45d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java @@ -39,7 +39,7 @@ public class KitGameModifier extends GameModifierGadget @Override public void enableCustom(Player player, boolean message) { - Manager.getGameModifiers(getGameType()).stream().filter(getKitFilter(_kitType)).forEach(g -> g.disable(player)); + _manager.getGameModifiers(getGameType()).stream().filter(getKitFilter(_kitType)).forEach(g -> g.disable(player)); super.enableCustom(player, message); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java index df1cf150f..fb83978b9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java @@ -86,7 +86,7 @@ public class GameModifierMineStrikeSkin extends GameModifierGadget @Override public void enableCustom(Player player, boolean message) { - Manager.getGameModifiers(getGameType()).stream().filter(getWeaponFilter(_weapon)).forEach(g -> g.disable(player)); + _manager.getGameModifiers(getGameType()).stream().filter(getWeaponFilter(_weapon)).forEach(g -> g.disable(player)); super.enableCustom(player, message); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java index 67aa5cc1e..8c90a821a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java @@ -1,5 +1,16 @@ package mineplex.core.gadget.gadgets.item; +import java.util.ArrayList; +import java.util.HashMap; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.entity.Bat; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.util.Vector; + import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.LineFormat; @@ -20,16 +31,6 @@ import mineplex.core.preferences.Preference; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Sound; -import org.bukkit.entity.Bat; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.util.Vector; - -import java.util.ArrayList; -import java.util.HashMap; public class ItemBatGun extends ItemGadget { @@ -102,7 +103,7 @@ public class ItemBatGun extends ItemGadget if (other.equals(cur)) continue; - if (!Manager.getPreferencesManager().get(other).isActive(Preference.HUB_GAMES) || !Manager.getPreferencesManager().get(other).isActive(Preference.SHOW_PLAYERS)) + if (!_manager.getPreferencesManager().get(other).isActive(Preference.HUB_GAMES) || !_manager.getPreferencesManager().get(other).isActive(Preference.SHOW_PLAYERS)) continue; if (!Recharge.Instance.usable(other, "Hit by Bat")) @@ -110,7 +111,7 @@ public class ItemBatGun extends ItemGadget if (UtilEnt.hitBox(bat.getLocation(), other, 2, null)) { - if (Manager.collideEvent(cur, this, other)) + if (_manager.collideEvent(cur, this, other)) continue; //Damage Event diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java index 16e78ec14..c909c74fb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java @@ -92,7 +92,7 @@ public class ItemBow extends ItemGadget UtilText.splitLineToArray(C.cGray + "This symbol of love will live on with you forever! Mainly because we couldn't attach the cupid wings to it. I guess duct tape can't fix everything!", LineFormat.LORE), -6, Material.BOW, (byte) 0, 1000, new Ammo("Cupid Arrow", "Cupid's Arrows", Material.ARROW, (byte) 0, UtilText.splitLineToArray(C.cGray + "Use these arrows to shoot love into people's hearts!", LineFormat.LORE), -6, 15)); - Manager.getPacketManager().addPacketHandler(_packetHandler, PacketPlayOutSpawnEntity.class); + _manager.getPacketManager().addPacketHandler(_packetHandler, PacketPlayOutSpawnEntity.class); } @Override @@ -134,7 +134,7 @@ public class ItemBow extends ItemGadget if (!_arrows.contains(arrow)) return; - Bukkit.getScheduler().runTaskLater(Manager.getPlugin(), new Runnable() + Bukkit.getScheduler().runTaskLater(_manager.getPlugin(), new Runnable() { @Override public void run() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java new file mode 100644 index 000000000..71b5f37b8 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java @@ -0,0 +1,103 @@ +package mineplex.core.gadget.gadgets.item; + +import java.time.Month; +import java.time.YearMonth; + +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.entity.Item; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; + +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import mineplex.core.common.util.LineFormat; +import mineplex.core.common.util.UtilAction; +import mineplex.core.common.util.UtilBlock; +import mineplex.core.common.util.UtilGear; +import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilText; +import mineplex.core.gadget.GadgetManager; +import mineplex.core.gadget.gadgets.Ammo; +import mineplex.core.gadget.types.ItemGadget; +import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.projectile.IThrown; +import mineplex.core.projectile.ProjectileUser; + +public class ItemBubbleBlaster extends ItemGadget implements IThrown +{ + + public ItemBubbleBlaster(GadgetManager manager) + { + super(manager, "Bubble Blaster", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE), + -14, Material.DIAMOND_BARDING, (byte) 0, 5000, new Ammo("Bubble", "Bubble", Material.DIAMOND_BARDING, (byte) 0, new String[]{C.cGray + "Placeholder"}, -5, 1), + YearMonth.of(2017, Month.APRIL)); + } + + @Override + public void disableCustom(Player player, boolean message) + { + super.disableCustom(player, message); + } + + @Override + public void ActivateCustom(Player player) + { + + } + + @Override + @EventHandler + public void Activate(PlayerInteractEvent event) + { + if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK) + return; + + if (UtilBlock.usable(event.getClickedBlock())) + return; + + if (!UtilGear.isMat(event.getPlayer().getItemInHand(), this.getDisplayMaterial())) + return; + + Player player = event.getPlayer(); + + if (!isActive(player)) + return; + + event.setCancelled(true); + + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + + // TODO CHANGE COLOR IF RAINBOW + // TODO COOLDOWN AFTER MAX OF 5 SECONDS HOLDING + // TODO LAUNCH MULTIPLE WHILE HOLDING + Item item = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS, (byte) UtilMath.random.nextInt(15))); + + UtilAction.velocity(item, player.getLocation().getDirection(), + 1, false, 0, 0.2, 10, false); + + _manager.getProjectileManager().AddThrow(item, player, this, 1000, false, false, false, false, false, 0f); + } + + @Override + public void Collide(LivingEntity target, Block block, ProjectileUser data) + { + + } + + @Override + public void Idle(ProjectileUser data) + { + + } + + @Override + public void Expire(ProjectileUser data) + { + data.getThrown().remove(); + } + +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java index 118f1b8b9..8b1b2cf60 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java @@ -3,7 +3,6 @@ package mineplex.core.gadget.gadgets.item; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; @@ -83,16 +82,16 @@ public class ItemCoal extends ItemGadget int goal = -1; //Coal Hat - if (!Manager.getHatGadget(HatType.COAL).ownsGadget(player)) + if (!_manager.getHatGadget(HatType.COAL).ownsGadget(player)) { goal = _hat; - if(Manager.getInventoryManager().Get(player).getItemCount(getName()) >= _hat) + if(_manager.getInventoryManager().Get(player).getItemCount(getName()) >= _hat) { Recharge.Instance.recharge(player, getName()); Recharge.Instance.use(player, getName(), 30000, true, true); - Manager.getInventoryManager().addItemToInventory(new Callback() + _manager.getInventoryManager().addItemToInventory(new Callback() { @Override public void run(Boolean data) @@ -104,10 +103,10 @@ public class ItemCoal extends ItemGadget UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation(), 0.5f, 0.0f, 0.5f, 0, 100, ViewDist.LONG); player.getWorld().playSound(player.getLocation(), Sound.WITHER_DEATH, 0.8f, 0); - Manager.getInventoryManager().addItemToInventory(player, getName(), -_hat); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + _manager.getInventoryManager().addItemToInventory(player, getName(), -_hat); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); - Manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Lump of Coal Hat"); + _manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Lump of Coal Hat"); UtilServer.CallEvent(new PlayerUseCoalEvent(player, PlayerUseCoalEvent.CoalReward.HAT, _particle)); } @@ -122,19 +121,19 @@ public class ItemCoal extends ItemGadget } //Coal Apparition - if (!Manager.getPetManager().Get(player).getPets().containsKey(PetType.PIG_ZOMBIE)) + if (!_manager.getPetManager().Get(player).getPets().containsKey(PetType.PIG_ZOMBIE)) { goal = _pet; - if(Manager.getInventoryManager().Get(player).getItemCount(getName()) >= _pet) + if(_manager.getInventoryManager().Get(player).getItemCount(getName()) >= _pet) { Recharge.Instance.recharge(player, getName()); Recharge.Instance.use(player, getName(), 30000, true, true); PetReward reward = new PetReward( - Manager.getPetManager(), - Manager.getInventoryManager(), - Manager.getDonationManager(), + _manager.getPetManager(), + _manager.getInventoryManager(), + _manager.getDonationManager(), "Coal Apparition", "Coal Apparition", PetType.PIG_ZOMBIE, RewardRarity.OTHER, 0, 0); if (reward.canGiveReward(player)) @@ -148,10 +147,10 @@ public class ItemCoal extends ItemGadget UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation(), 1f, 0.0f, 1f, 0, 250, ViewDist.LONG); player.getWorld().playSound(player.getLocation(), Sound.WITHER_DEATH, 0.8f, 0); - Manager.getInventoryManager().addItemToInventory(player, getName(), -_pet); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + _manager.getInventoryManager().addItemToInventory(player, getName(), -_pet); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); - Manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Apparition"); + _manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Apparition"); UtilServer.CallEvent(new PlayerUseCoalEvent(player, PlayerUseCoalEvent.CoalReward.PET, _particle)); } @@ -162,16 +161,16 @@ public class ItemCoal extends ItemGadget } //Coal Particle - if (!Manager.getGadget(ParticleCoalFumes.class).ownsGadget(player)) + if (!_manager.getGadget(ParticleCoalFumes.class).ownsGadget(player)) { goal = _particle; - if(Manager.getInventoryManager().Get(player).getItemCount(getName()) >= _particle) + if(_manager.getInventoryManager().Get(player).getItemCount(getName()) >= _particle) { Recharge.Instance.recharge(player, getName()); Recharge.Instance.use(player, getName(), 30000, true, true); - Manager.getInventoryManager().addItemToInventory(new Callback() + _manager.getInventoryManager().addItemToInventory(new Callback() { @Override public void run(Boolean data) @@ -183,10 +182,10 @@ public class ItemCoal extends ItemGadget UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation(), 1.5f, 0.0f, 1.5f, 0, 500, ViewDist.LONG); player.getWorld().playSound(player.getLocation(), Sound.WITHER_DEATH, 0.8f, 0); - Manager.getInventoryManager().addItemToInventory(player, getName(), -_particle); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + _manager.getInventoryManager().addItemToInventory(player, getName(), -_particle); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); - Manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Fumes"); + _manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Fumes"); UtilServer.CallEvent(new PlayerUseCoalEvent(player, PlayerUseCoalEvent.CoalReward.PARTICLE, _particle)); } @@ -200,7 +199,7 @@ public class ItemCoal extends ItemGadget } } - goal -= Manager.getInventoryManager().Get(player).getItemCount(getName()); + goal -= _manager.getInventoryManager().Get(player).getItemCount(getName()); if (goal > 0 && Math.random() > 0.95) { @@ -239,7 +238,7 @@ public class ItemCoal extends ItemGadget event.setCancelled(true); //Stock - if (Manager.getInventoryManager().Get(player).getItemCount(getName()) <= 0) + if (_manager.getInventoryManager().Get(player).getItemCount(getName()) <= 0) { UtilPlayer.message(player, F.main("Gadget", "You do not have any " + getName() + " left.")); @@ -257,7 +256,7 @@ public class ItemCoal extends ItemGadget return; } - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); ActivateCustom(event.getPlayer()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java index 7334375b3..6d63dacd4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java @@ -110,7 +110,7 @@ public class ItemCoinBomb extends ItemGadget event.setCancelled(true); event.getItem().remove(); - Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Pickup", 4); + _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Pickup", 4); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1f, 2f); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java index 09d4499ae..62a2fa0a1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java @@ -28,11 +28,11 @@ public class ItemDuelingSword extends ItemGadget @Override public void ApplyItem(Player player, boolean inform) { - Manager.removeGadgetType(player, GadgetType.ITEM); + _manager.removeGadgetType(player, GadgetType.ITEM); _active.add(player); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, "PvP Sword")); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, "PvP Sword")); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java index 6c454ebff..ee030a9f6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java @@ -44,7 +44,7 @@ public class ItemFleshHook extends ItemGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 1.6, false, 0, 0.2, 10, false); - Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, Sound.FIRE_IGNITE, 1.4f, 0.8f, ParticleType.CRIT, null, 0, UpdateType.TICK, 0.5f); //Inform @@ -67,7 +67,7 @@ public class ItemFleshHook extends ItemGadget implements IThrown if (target == null) return; - if (Manager.collideEvent(player, this, target)) + if (_manager.collideEvent(player, this, target)) return; if (target instanceof ArmorStand) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java index ce3e899d1..a08e19136 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java @@ -61,7 +61,7 @@ public class ItemFreezeCannon extends ItemGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 1, false, 0, 0.2, 10, false); - Manager.getProjectileManager().AddThrow(item, player, this, 5000, true, true, true, true, + _manager.getProjectileManager().AddThrow(item, player, this, 5000, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); //Inform @@ -81,11 +81,11 @@ public class ItemFreezeCannon extends ItemGadget implements IThrown int ticks = 4 * 20; if(isClear(p.getLocation())) { - Manager.getBlockRestore().add(p.getLocation().getBlock(), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); - Manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.UP), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); + _manager.getBlockRestore().add(p.getLocation().getBlock(), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); + _manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.UP), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); if(p.getLocation().getBlock().getRelative(BlockFace.DOWN).getType() == Material.AIR) { - Manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.DOWN), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); + _manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.DOWN), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); } p.setWalkSpeed(0); _playerMap.put(p, System.currentTimeMillis() + (ticks * 50)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java index f2246773c..22eda4fd1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java @@ -72,16 +72,16 @@ public class ItemLovePotion extends ItemGadget @Override public void ApplyItem(Player player, boolean inform) { - Manager.removeGadgetType(player, GadgetType.ITEM); + _manager.removeGadgetType(player, GadgetType.ITEM); _active.add(player); List itemLore = new ArrayList(); itemLore.addAll(Arrays.asList(getDescription())); itemLore.add(C.cBlack); - itemLore.add(C.cWhite + "Your Ammo : " + Manager.getInventoryManager().Get(player).getItemCount(getName())); + itemLore.add(C.cWhite + "Your Ammo : " + _manager.getInventoryManager().Get(player).getItemCount(getName())); - player.getInventory().setItem(Manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); + player.getInventory().setItem(_manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); if (inform) UtilPlayer.message(player, F.main("Gadget", "You equipped " + F.elem(getName()) + ".")); @@ -130,12 +130,12 @@ public class ItemLovePotion extends ItemGadget Recharge.Instance.use(player, getName(), getName(), _recharge, _recharge > 1000, true, false, true, "Cosmetics"); // Cooldown - Manager.getInventoryManager().addItemToInventory(player, getName(), -1); + _manager.getInventoryManager().addItemToInventory(player, getName(), -1); ItemGadgetUseEvent itemGadgetUseEvent = new ItemGadgetUseEvent(player, this, 1); UtilServer.CallEvent(itemGadgetUseEvent); - player.getInventory().setItem(Manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); + player.getInventory().setItem(_manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); } @EventHandler @@ -181,9 +181,9 @@ public class ItemLovePotion extends ItemGadget String message = UtilMath.randomElement(DRINK_MESSAGES); UtilPlayer.message(player, F.main("Potion", message)); - Manager.getInventoryManager().addItemToInventory(player, getName(), -1); + _manager.getInventoryManager().addItemToInventory(player, getName(), -1); - player.getInventory().setItem(Manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); + player.getInventory().setItem(_manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); ItemGadgetUseEvent itemGadgetUseEvent = new ItemGadgetUseEvent(player, this, 1); UtilServer.CallEvent(itemGadgetUseEvent); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java index 264118b41..b85871689 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java @@ -59,7 +59,7 @@ public class ItemMelonLauncher extends ItemGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 1, false, 0, 0.2, 10, false); - Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); //Inform diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java index 98171d0c3..4ff638648 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java @@ -52,14 +52,14 @@ public class ItemPaintbrush extends ItemGadget @Override public void ApplyItem(Player player, boolean inform) { - Manager.removeGadgetType(player, GadgetType.ITEM); + _manager.removeGadgetType(player, GadgetType.ITEM); _active.add(player); List itemLore = new ArrayList(); itemLore.addAll(Arrays.asList(getDescription())); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, getName())); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, getName())); if (inform) UtilPlayer.message(player, F.main("Gadget", "You equipped " + F.elem(getName()) + ".")); @@ -161,7 +161,7 @@ public class ItemPaintbrush extends ItemGadget continue; //Color - Manager.getBlockRestore().add(block, 35, _brushColor.get(player.getName()), 30000); + _manager.getBlockRestore().add(block, 35, _brushColor.get(player.getName()), 30000); //Join Dots if (_brushPrevious.containsKey(player.getName())) @@ -175,7 +175,7 @@ public class ItemPaintbrush extends ItemGadget if (fixBlock.getType() != Material.WOOL) continue; - Manager.getBlockRestore().add(fixBlock, 35, _brushColor.get(player.getName()), 30000); + _manager.getBlockRestore().add(fixBlock, 35, _brushColor.get(player.getName()), 30000); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java index ebca74d1f..7d6677593 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java @@ -55,7 +55,7 @@ public class ItemSnowball extends ItemGadget if(!_snowballs.containsKey(ball)) return; - if(Manager.collideEvent(_snowballs.remove(ball), this, event.getEntity())) return; + if(_manager.collideEvent(_snowballs.remove(ball), this, event.getEntity())) return; if (event.getEntity() instanceof ArmorStand) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java index eecba68e1..6cfdf587d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java @@ -65,7 +65,7 @@ public class ItemTNT extends ItemGadget HashMap players = UtilPlayer.getInRadius(event.getLocation(), 8); for (Player player : players.keySet()) { - if (Manager.collideEvent(killer, this, player)) + if (_manager.collideEvent(killer, this, player)) continue; double mult = players.get(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java index 2b1c13ea3..adc6cea4c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java @@ -69,7 +69,7 @@ public class BlockForm _hiddenDisguise = new DisguiseSlime(player); _hiddenDisguise.setInvisible(true); - _host.Manager.getDisguiseManager().disguise(_hiddenDisguise); + _host._manager.getDisguiseManager().disguise(_hiddenDisguise); this._fallingBlock = _loc.getWorld().spawn(_loc, Slime.class); this._fallingBlock.setSize(0); @@ -92,7 +92,7 @@ public class BlockForm _disguiseBlockBase = new DisguiseSlime(_fallingBlockBase); _disguiseBlockBase.SetSize(0); _disguiseBlockBase.setInvisible(true); - _host.Manager.getDisguiseManager().disguise(_disguiseBlockBase); + _host._manager.getDisguiseManager().disguise(_disguiseBlockBase); reset(); } @@ -103,7 +103,7 @@ public class BlockForm _disguiseBlock = new DisguiseBlock(_fallingBlock, _blockMat.getId(), _blockData); _disguiseBlock.setHideIfNotDisguised(true); - _host.Manager.getDisguiseManager().disguise(_disguiseBlock); + _host._manager.getDisguiseManager().disguise(_disguiseBlock); _fallingBlockBase.setPassenger(_fallingBlock); } @@ -112,7 +112,7 @@ public class BlockForm { if (_disguiseBlock != null) { - _host.Manager.getDisguiseManager().undisguise(_disguiseBlock); + _host._manager.getDisguiseManager().undisguise(_disguiseBlock); _disguiseBlock = null; _fallingBlockBase.setPassenger(null); } @@ -142,8 +142,8 @@ public class BlockForm removeSolidBlock(); removeFallingBlock(); - _host.Manager.getDisguiseManager().undisguise(_hiddenDisguise); - _host.Manager.getDisguiseManager().undisguise(_disguiseBlockBase); + _host._manager.getDisguiseManager().undisguise(_hiddenDisguise); + _host._manager.getDisguiseManager().undisguise(_disguiseBlockBase); _fallingBlockBase.remove(); _fallingBlockBase = null; _fallingBlock.remove(); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java index 4225b2c6b..ada824454 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java @@ -60,14 +60,14 @@ public class MorphBat extends MorphGadget implements IThrown this.applyArmor(player, message); DisguiseBat disguise = new DisguiseBat(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); @@ -113,7 +113,7 @@ public class MorphBat extends MorphGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 0.01, true, -0.3, 0, 10, false); - Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); //Inform diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java index abd40e459..592ad0b5f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java @@ -43,14 +43,14 @@ public class MorphBlaze extends MorphGadget this.applyArmor(player, message); DisguiseBlaze disguise = new DisguiseBlaze(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler @@ -81,9 +81,9 @@ public class MorphBlaze extends MorphGadget @EventHandler public void HeroOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java index ef51b27f4..91fb1f916 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java @@ -71,7 +71,7 @@ public class MorphBunny extends MorphGadget this.applyArmor(player, message); DisguiseRabbit disguise = new DisguiseRabbit(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 999999999, 1)); player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP, 999999999, 1)); @@ -82,7 +82,7 @@ public class MorphBunny extends MorphGadget { _jumpCharge.remove(player); this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.removePotionEffect(PotionEffectType.SPEED); player.removePotionEffect(PotionEffectType.JUMP); @@ -150,7 +150,7 @@ public class MorphBunny extends MorphGadget if (!UtilEvent.isAction(event, ActionType.L)) return; - if (Manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < 500) + if (_manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < 500) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards.")); return; @@ -170,7 +170,7 @@ public class MorphBunny extends MorphGadget UtilAction.velocity(egg, player.getLocation().getDirection(), 0.2, false, 0, 0.2, 1, false); - Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Egg Hide", -500); + _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Egg Hide", -500); egg.setPickupDelay(40); @@ -197,7 +197,7 @@ public class MorphBunny extends MorphGadget event.setCancelled(true); event.getItem().remove(); - Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Egg Pickup", 450); + _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Egg Pickup", 450); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1.5f, 0.75f); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1.5f, 1.25f); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java index ce37ddde3..56da39934 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java @@ -49,14 +49,14 @@ public class MorphChicken extends MorphGadget this.applyArmor(player, message); DisguiseChicken disguise = new DisguiseChicken(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java index 24803972f..398c547b6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java @@ -66,7 +66,7 @@ public class MorphChristmasKing extends MorphGadget DisguiseSkeleton disguise = new DisguiseSkeleton(player); disguise.showArmor(); disguise.SetSkeletonType(SkeletonType.WITHER); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); player.getInventory().setHelmet(new ItemStack(Material.JACK_O_LANTERN)); @@ -78,7 +78,7 @@ public class MorphChristmasKing extends MorphGadget public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.getInventory().setHelmet(null); } @@ -119,7 +119,7 @@ public class MorphChristmasKing extends MorphGadget { for (Player player : getActive()) { - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { continue; } @@ -163,7 +163,7 @@ public class MorphChristmasKing extends MorphGadget if (!_snowball.containsKey(proj)) return; - if (Manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) + if (_manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) return; UtilAction.velocity(event.getEntity(), proj.getVelocity().multiply(0.15).add(new Vector(0, 0.15, 0))); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java index f8d334a12..cf7258be7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java @@ -37,14 +37,14 @@ public class MorphCow extends MorphGadget this.applyArmor(player, message); DisguiseCow disguise = new DisguiseCow(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java index bcce06361..54396a316 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java @@ -51,14 +51,14 @@ public class MorphCreeper extends MorphGadget this.applyArmor(player, message); DisguiseCreeper disguise = new DisguiseCreeper(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler @@ -111,7 +111,7 @@ public class MorphCreeper extends MorphGadget if (other.equals(player)) continue; - if (Manager.collideEvent(player, this, other)) + if (_manager.collideEvent(player, this, other)) continue; double mult = players.get(other); @@ -127,7 +127,7 @@ public class MorphCreeper extends MorphGadget public DisguiseCreeper GetDisguise(Player player) { - DisguiseBase disguise = Manager.getDisguiseManager().getDisguise(player); + DisguiseBase disguise = _manager.getDisguiseManager().getDisguise(player); if (disguise == null) return null; @@ -152,7 +152,7 @@ public class MorphCreeper extends MorphGadget creeper.a(-1); - Manager.getDisguiseManager().updateDisguise(creeper); + _manager.getDisguiseManager().updateDisguise(creeper); } public void IncreaseSize(Player player) @@ -162,15 +162,15 @@ public class MorphCreeper extends MorphGadget creeper.a(1); - Manager.getDisguiseManager().updateDisguise(creeper); + _manager.getDisguiseManager().updateDisguise(creeper); } @EventHandler public void HeroOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java index ba67af21c..0f2907d90 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java @@ -10,7 +10,6 @@ import java.util.UUID; import net.minecraft.server.v1_8_R3.DataWatcher; import net.minecraft.server.v1_8_R3.EntityArmorStand; -import net.minecraft.server.v1_8_R3.EntitySlime; import net.minecraft.server.v1_8_R3.MathHelper; import net.minecraft.server.v1_8_R3.PacketPlayOutAttachEntity; import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy; @@ -33,7 +32,6 @@ import mineplex.core.Managers; import mineplex.core.account.CoreClientManager; import mineplex.core.common.DummyEntity; import mineplex.core.common.Rank; -import mineplex.core.common.skin.SkinData; import mineplex.core.common.util.C; import mineplex.core.common.util.LineFormat; import mineplex.core.common.util.UtilEnt; @@ -92,7 +90,7 @@ public class MorphDinnerbone extends MorphGadget implements IPacketHandler disguisePlayer.setSendSkinDataToSelf(false); disguisePlayer.setReplaceOriginalName(false, 10); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, Manager); + UtilMorph.disguise(player, disguisePlayer, _manager); } @Override @@ -100,7 +98,7 @@ public class MorphDinnerbone extends MorphGadget implements IPacketHandler { removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @Override @@ -120,7 +118,7 @@ public class MorphDinnerbone extends MorphGadget implements IPacketHandler } Player owner = (Player) entity; - if (Manager.getActive(owner, GadgetType.MORPH) == this) + if (_manager.getActive(owner, GadgetType.MORPH) == this) { summonForEntity(packetInfo.getPlayer(), owner); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java index 761003e4d..1ee120535 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java @@ -48,14 +48,14 @@ public class MorphEnderman extends MorphGadget this.applyArmor(player, message); DisguiseEnderman disguise = new DisguiseEnderman(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java index 017c3642f..bf2ce7239 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java @@ -47,10 +47,10 @@ public class MorphGoldPot extends MorphGadget { applyArmor(player, message); - _helpers.put(player, new GoldPotHelper(player, Manager, this)); + _helpers.put(player, new GoldPotHelper(player, _manager, this)); DisguiseBlock disguiseBlock = new DisguiseBlock(player, Material.CAULDRON, (byte) 0); - UtilMorph.disguise(player, disguiseBlock, Manager); + UtilMorph.disguise(player, disguiseBlock, _manager); } @Override @@ -65,7 +65,7 @@ public class MorphGoldPot extends MorphGadget _helpers.remove(player); } - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java index 44c761772..5fbabe83e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java @@ -98,7 +98,7 @@ public class MorphGrimReaper extends MorphGadget skeleton.setChestplate(blackChest); skeleton.setLeggings(blackPants); skeleton.setBoots(blackBoots); - UtilMorph.disguise(player, skeleton, Manager.getDisguiseManager()); + UtilMorph.disguise(player, skeleton, _manager.getDisguiseManager()); } @Override @@ -110,7 +110,7 @@ public class MorphGrimReaper extends MorphGadget _flying.remove(player); _flyReady.remove(player); _soulManager.resetSouls(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.getInventory().setItem(2, new ItemStack(Material.AIR)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java index 1a96f75d1..0f277d2c5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java @@ -47,7 +47,7 @@ public class MorphLoveDoctor extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, gameProfile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, Manager); + UtilMorph.disguise(player, disguisePlayer, _manager); } @Override @@ -55,7 +55,7 @@ public class MorphLoveDoctor extends MorphGadget { removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java index 06838168e..729f4e534 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java @@ -72,7 +72,7 @@ public class MorphMetalMan extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, gameProfile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, Manager); + UtilMorph.disguise(player, disguisePlayer, _manager); player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, Integer.MAX_VALUE, 1, true, false)); } @@ -82,7 +82,7 @@ public class MorphMetalMan extends MorphGadget { removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); if (_playerColors.containsKey(player.getUniqueId())) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java index d45504531..974e068cc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java @@ -53,14 +53,14 @@ public class MorphPig extends MorphGadget this.applyArmor(player, message); DisguisePig disguise = new DisguisePig(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler @@ -84,9 +84,9 @@ public class MorphPig extends MorphGadget @EventHandler public void HeroOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ULTRA)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ULTRA)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } @@ -136,7 +136,7 @@ public class MorphPig extends MorphGadget if (UtilMath.offset(player, other) > range) continue; - if (Manager.collideEvent(player, this, other)) + if (_manager.collideEvent(player, this, other)) continue; //Cooldown diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java index cb13b4ff5..96e89e3f2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java @@ -67,7 +67,7 @@ public class MorphPumpkinKing extends MorphGadget DisguiseSkeleton disguise = new DisguiseSkeleton(player); disguise.showArmor(); disguise.SetSkeletonType(SkeletonType.WITHER); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); player.getInventory().setHelmet(new ItemStack(Material.JACK_O_LANTERN)); @@ -79,7 +79,7 @@ public class MorphPumpkinKing extends MorphGadget public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.getInventory().setHelmet(null); } @@ -106,7 +106,7 @@ public class MorphPumpkinKing extends MorphGadget { for (Player player : getActive()) { - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { continue; } @@ -140,7 +140,7 @@ public class MorphPumpkinKing extends MorphGadget _ent = spawnLocation.getWorld().dropItem(spawnLocation, new ItemBuilder(Material.APPLE).setTitle(new Random().nextDouble() + "").build()); _ent.setPickupDelay(Integer.MAX_VALUE); _disguise = new DisguiseBlock(_ent, Material.JACK_O_LANTERN.getId(), 0); - Manager.getDisguiseManager().disguise(_disguise); + _manager.getDisguiseManager().disguise(_disguise); _detonation = System.currentTimeMillis() + 7000; _done = false; } @@ -157,7 +157,7 @@ public class MorphPumpkinKing extends MorphGadget Map players = UtilPlayer.getInRadius(_ent.getLocation(), 8); for (Player player : players.keySet()) { - if (Manager.collideEvent(_user, MorphPumpkinKing.this, player)) + if (_manager.collideEvent(_user, MorphPumpkinKing.this, player)) continue; double mult = players.get(player); @@ -165,7 +165,7 @@ public class MorphPumpkinKing extends MorphGadget //Knockback UtilAction.velocity(player, UtilAlg.getTrajectory(_ent.getLocation(), player.getLocation()), 1 * mult, false, 0, 0.5 + 0.5 * mult, 10, true); } - Manager.getDisguiseManager().undisguise(_disguise); + _manager.getDisguiseManager().undisguise(_disguise); _ent.remove(); _done = true; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java index 7c857694b..36d6eafe3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java @@ -67,7 +67,7 @@ public class MorphSanta extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, profile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, Manager); + UtilMorph.disguise(player, disguisePlayer, _manager); } @Override @@ -75,7 +75,7 @@ public class MorphSanta extends MorphGadget { removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler @@ -103,7 +103,7 @@ public class MorphSanta extends MorphGadget { int shards = UtilMath.rRange(250, 500); - if (Manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < shards + SHARD_CHARGE) + if (_manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < shards + SHARD_CHARGE) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards.")); return; @@ -116,7 +116,7 @@ public class MorphSanta extends MorphGadget SkinData.PRESENT.getSkull("Hidden Present " + System.currentTimeMillis(), new ArrayList<>())); UtilAction.velocity(present, player.getLocation().getDirection(), 0.2, false, 0, 0.2, 1, false); - Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Present Hide", -(shards + SHARD_CHARGE)); + _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Present Hide", -(shards + SHARD_CHARGE)); present.setPickupDelay(40); @@ -189,7 +189,7 @@ public class MorphSanta extends MorphGadget if (santaPresent.getPresentType().equals(SantaPresent.PresentType.PRESENT)) { - Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Present Pickup", santaPresent.getAmmo()); + _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Present Pickup", santaPresent.getAmmo()); //Announce Bukkit.broadcastMessage(C.cGold + C.Bold + event.getPlayer().getName() + @@ -200,7 +200,7 @@ public class MorphSanta extends MorphGadget else if (santaPresent.getPresentType().equals(SantaPresent.PresentType.COAL)) { // Gives coals - Manager.getInventoryManager().addItemToInventory(event.getPlayer(), "Coal", santaPresent.getAmmo()); + _manager.getInventoryManager().addItemToInventory(event.getPlayer(), "Coal", santaPresent.getAmmo()); //Announce Bukkit.broadcastMessage(C.cGold + C.Bold + event.getPlayer().getName() + diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java index 925934a72..492b89837 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java @@ -60,14 +60,14 @@ public class MorphSlime extends MorphGadget disguise.SetSize(size); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java index 25326feff..2f429b00b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java @@ -60,14 +60,14 @@ public class MorphSnowman extends MorphGadget this.applyArmor(player, message); DisguiseSnowman disguise = new DisguiseSnowman(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler @@ -141,7 +141,7 @@ public class MorphSnowman extends MorphGadget if (!_snowball.containsKey(proj)) return; - if(Manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) return; + if(_manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) return; UtilAction.velocity(event.getEntity(), proj.getVelocity().multiply(0.15).add(new Vector(0, 0.15, 0))); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java index 096f453fd..6e16287d2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java @@ -54,7 +54,7 @@ public class MorphSquid extends MorphGadget implements IThrown { applyArmor(player, message); DisguiseSquid disguiseSquid = new DisguiseSquid(player); - UtilMorph.disguise(player, disguiseSquid, Manager); + UtilMorph.disguise(player, disguiseSquid, _manager); onToggleSwim(new PlayerToggleSwimEvent(player, SwimManager.isSwimming(player.getUniqueId()), SwimManager.isInLava(player.getUniqueId()))); } @@ -62,7 +62,7 @@ public class MorphSquid extends MorphGadget implements IThrown public void disableCustom(Player player, boolean message) { removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler @@ -89,7 +89,7 @@ public class MorphSquid extends MorphGadget implements IThrown if (event.isSwimming()) { // Removes any costume player could be wearing - Manager.removeOutfit(event.getPlayer(), OutfitGadget.ArmorSlot.BOOTS); + _manager.removeOutfit(event.getPlayer(), OutfitGadget.ArmorSlot.BOOTS); // Adds enchanted boot ItemStack enchantedBoot = new ItemStack(Material.DIAMOND_BOOTS, 1); @@ -126,7 +126,7 @@ public class MorphSquid extends MorphGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 0.01, true, -0.3, 1.5, 10, false); - Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java index 8a6571d36..457f864d8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java @@ -49,7 +49,7 @@ public class MorphStray extends MorphGadget // TODO CHECK IF LOBBY IS 1.9+ applyArmor(player, message); DisguiseSquid disguiseSquid = new DisguiseSquid(player); - UtilMorph.disguise(player, disguiseSquid, Manager); + UtilMorph.disguise(player, disguiseSquid, _manager); // Gives bow and arrow ItemStack bow = ItemStackFactory.Instance.CreateStack(Material.BOW, (byte) 0, 1, C.cGreen + "Stray Bow", UtilText.splitLinesToArray(new String[]{"Placeholder"}, LineFormat.LORE)); @@ -61,7 +61,7 @@ public class MorphStray extends MorphGadget public void disableCustom(Player player, boolean message) { removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); // Removes bow and arrow player.getInventory().setItem(2, new ItemStack(Material.AIR)); @@ -84,7 +84,7 @@ public class MorphStray extends MorphGadget _strayArrows.add((Arrow) event.getProjectile()); - Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() { @Override public void run() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java index 24cd35247..31dd8d69b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java @@ -65,14 +65,14 @@ public class MorphTitan extends MorphGadget DisguiseGuardian disguise = new DisguiseGuardian(player); disguise.setElder(true); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); @@ -96,7 +96,7 @@ public class MorphTitan extends MorphGadget if (!Recharge.Instance.use(player, "Guardians Laser", 6000, true, false, "Cosmetics")) return; - DisguiseBase base = Manager.getDisguiseManager().getDisguise(player); + DisguiseBase base = _manager.getDisguiseManager().getDisguise(player); if (base == null || !(base instanceof DisguiseGuardian)) return; @@ -130,7 +130,7 @@ public class MorphTitan extends MorphGadget disguise.setTarget(stand.getEntityId()); - Manager.getDisguiseManager().updateDisguise(disguise); + _manager.getDisguiseManager().updateDisguise(disguise); //Fake Head UtilEnt.setFakeHead(player, true); @@ -154,7 +154,7 @@ public class MorphTitan extends MorphGadget for (Player ent : players.keySet()) { if (ent instanceof Player) - if (Manager.collideEvent(event.GetPlayer(), this, (Player)ent)) + if (_manager.collideEvent(event.GetPlayer(), this, (Player)ent)) continue; double mult = players.get(ent); @@ -170,14 +170,14 @@ public class MorphTitan extends MorphGadget } //Disguise - DisguiseBase base = Manager.getDisguiseManager().getDisguise(event.GetPlayer()); + DisguiseBase base = _manager.getDisguiseManager().getDisguise(event.GetPlayer()); if (base == null || !(base instanceof DisguiseGuardian)) return; DisguiseGuardian disguise = (DisguiseGuardian)base; disguise.setTarget(0); - Manager.getDisguiseManager().updateDisguise(disguise); + _manager.getDisguiseManager().updateDisguise(disguise); } } @@ -225,9 +225,9 @@ public class MorphTitan extends MorphGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java index 6fc6a2f90..0f628fca6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java @@ -46,14 +46,14 @@ public class MorphTurkey extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, profile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, Manager); + UtilMorph.disguise(player, disguisePlayer, _manager); } @Override public void disableCustom(Player player, boolean message) { removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java index 55ea3a9ba..99e6d0eee 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java @@ -49,7 +49,7 @@ public class MorphUncleSam extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, profile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, Manager); + UtilMorph.disguise(player, disguisePlayer, _manager); } @Override @@ -57,7 +57,7 @@ public class MorphUncleSam extends MorphGadget { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java index 729c115b0..2e1fac522 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java @@ -60,14 +60,14 @@ public class MorphVillager extends MorphGadget implements IThrown this.applyArmor(player, message); DisguiseVillager disguise = new DisguiseVillager(player); - UtilMorph.disguise(player, disguise, Manager); + UtilMorph.disguise(player, disguise, _manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } @EventHandler @@ -81,7 +81,7 @@ public class MorphVillager extends MorphGadget implements IThrown if (!UtilEvent.isAction(event, ActionType.L)) return; - if (Manager.getDonationManager().Get(player).getBalance(GlobalCurrency.GEM) < 20) + if (_manager.getDonationManager().Get(player).getBalance(GlobalCurrency.GEM) < 20) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Gems.")); return; @@ -97,10 +97,10 @@ public class MorphVillager extends MorphGadget implements IThrown UtilAction.velocity(gem, player.getLocation().getDirection(), 1, false, 0, 0.2, 1, false); //Throw - Manager.getProjectileManager().AddThrow(gem, player, this, -1, true, true, true, true, + _manager.getProjectileManager().AddThrow(gem, player, this, -1, true, true, true, true, null, 1.4f, 0.8f, null, null, 0, UpdateType.TICK, 0.5f); - Manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, player, this.getName() + " Throw", -20); + _manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, player, this.getName() + " Throw", -20); gem.setPickupDelay(40); @@ -114,7 +114,7 @@ public class MorphVillager extends MorphGadget implements IThrown return; if (target instanceof Player) - if (Manager.collideEvent((Player) data.getThrower(), this, (Player) target)) + if (_manager.collideEvent((Player) data.getThrower(), this, (Player) target)) return; //Pull @@ -150,7 +150,7 @@ public class MorphVillager extends MorphGadget implements IThrown event.setCancelled(true); event.getItem().remove(); - Manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, event.getPlayer(), getName() + " Pickup", 16); + _manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, event.getPlayer(), getName() + " Pickup", 16); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1f, 2f); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java index d394b3e87..0ff6b9b7a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java @@ -42,7 +42,7 @@ public class MorphWitch extends MorphGadget { this.applyArmor(player, message); DisguiseWitch disguiseWitch = new DisguiseWitch(player); - UtilMorph.disguise(player, disguiseWitch, Manager); + UtilMorph.disguise(player, disguiseWitch, _manager); } @Override @@ -54,7 +54,7 @@ public class MorphWitch extends MorphGadget { witchEffectManager.stop(); } - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); } public ItemStack getWitchItem() @@ -100,14 +100,14 @@ public class MorphWitch extends MorphGadget } // Checks if player is opening a treasure chest/close to a treasure area - if (Manager.getTreasureManager() != null) + if (_manager.getTreasureManager() != null) { - if (Manager.getTreasureManager().isOpening(event.getPlayer())) + if (_manager.getTreasureManager().isOpening(event.getPlayer())) { UtilPlayer.message(event.getPlayer(), F.main("Witch Morph", "You can't place the cauldron there!")); return; } - for (Location blockLocation : Manager.getTreasureManager().getBlockLocations()) + for (Location blockLocation : _manager.getTreasureManager().getBlockLocations()) { if (blockLocation.distanceSquared(cauldronLocation) <= 25) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java index 59f9bcb46..6f827539a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java @@ -65,7 +65,7 @@ public class MorphWither extends MorphGadget player.setHealth(300); DisguiseWither disguise = new DisguiseWither(player); - UtilMorph.disguise(player, disguise, Manager, true); + UtilMorph.disguise(player, disguise, _manager, true); player.setMaxHealth(20); player.setHealth(20); @@ -75,7 +75,7 @@ public class MorphWither extends MorphGadget public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); @@ -127,7 +127,7 @@ public class MorphWither extends MorphGadget HashMap players = UtilPlayer.getInRadius(event.getLocation(), 6); for (Player player : players.keySet()) { - if (Manager.collideEvent((Player) skull.getShooter(), this, player)) + if (_manager.collideEvent((Player) skull.getShooter(), this, player)) continue; double mult = players.get(player); @@ -181,9 +181,9 @@ public class MorphWither extends MorphGadget public void legendOwner(PlayerJoinEvent event) { // TODO HARDCODED Wither Morph Database Item Id - 550 - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) { - Manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(550, getName()), 1)); + _manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(550, getName()), 1)); } } @@ -195,7 +195,7 @@ public class MorphWither extends MorphGadget { Player player = activeIterator.next(); - DisguiseBase disguise = Manager.getDisguiseManager().getDisguise(player); + DisguiseBase disguise = _manager.getDisguiseManager().getDisguise(player); if (disguise == null || !(disguise instanceof DisguiseWither)) { @@ -206,7 +206,7 @@ public class MorphWither extends MorphGadget ((DisguiseWither)disguise).setName(text); ((DisguiseWither)disguise).setHealth((float) (healthPercent * 300)); - Manager.getDisguiseManager().updateDisguise(disguise); + _manager.getDisguiseManager().updateDisguise(disguise); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java index bcda0800d..3aa1734ea 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java @@ -50,16 +50,16 @@ public class OutfitTeam extends OutfitGadget } enableCustom(player, true); - Manager.setActive(player, this); + _manager.setActive(player, this); Bukkit.getServer().getPluginManager().callEvent(new GadgetAppliedEvent(player, this)); } @Override public void applyArmor(Player player, boolean message) { - Manager.removeGadgetType(player, GadgetType.MORPH); + _manager.removeGadgetType(player, GadgetType.MORPH); - Manager.removeOutfit(player, _slot); + _manager.removeOutfit(player, _slot); _active.add(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java index 0cba46733..62cfc46fc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java @@ -130,13 +130,13 @@ public class OutfitFreezeSuit extends OutfitGadget for (Block block : blocks.keySet()) { - if (Manager.getTreasureManager() != null) + if (_manager.getTreasureManager() != null) { - if (Manager.getTreasureManager().isOpening(player)) + if (_manager.getTreasureManager().isOpening(player)) { forceBreak= true; } - for (Location blockLocation : Manager.getTreasureManager().getBlockLocations()) + for (Location blockLocation : _manager.getTreasureManager().getBlockLocations()) { if (blockLocation.distanceSquared(block.getLocation()) <= 25) { @@ -150,7 +150,7 @@ public class OutfitFreezeSuit extends OutfitGadget if (!setBlocks) continue; - Manager.getBlockRestore().snow(block, (byte) 1, (byte) 1, (int) (DURATION * (1 + blocks.get(block))), 250, 0); + _manager.getBlockRestore().snow(block, (byte) 1, (byte) 1, (int) (DURATION * (1 + blocks.get(block))), 250, 0); } } } @@ -180,7 +180,7 @@ public class OutfitFreezeSuit extends OutfitGadget else { block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, 79); - Manager.getBlockRestore().add(block, 79, (byte) 0, MELT_TIME); + _manager.getBlockRestore().add(block, 79, (byte) 0, MELT_TIME); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java index 8261df65c..4d919a826 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java @@ -38,7 +38,7 @@ public class ParticleChristmasTree extends ParticleGadget { if (!_effects.containsKey(player.getUniqueId())) { - ChristmasTreeEffect christmasTreeEffect = new ChristmasTreeEffect(Manager.getPlugin(), player, Manager); + ChristmasTreeEffect christmasTreeEffect = new ChristmasTreeEffect(_manager.getPlugin(), player, _manager); christmasTreeEffect.start(); _effects.put(player.getUniqueId(), christmasTreeEffect); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java index 467db55d2..2c816f6f6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java @@ -33,7 +33,7 @@ public class ParticleCoalFumes extends ParticleGadget int amount = 5; ParticleType type = ParticleType.LARGE_SMOKE; - if(Manager.isMoving(player)) + if(_manager.isMoving(player)) { xz = 0.4f; amount = 2; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java index 0a2298be6..86cbdf972 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java @@ -31,7 +31,7 @@ public class ParticleFireRings extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.FLAME, player.getLocation().add(0, 1f, 0), 0.2f, 0.2f, 0.2f, 0, 1, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java index 92239bdfd..e6914496b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java @@ -47,16 +47,16 @@ public class ParticleKronos extends ParticleGadget if (!_glass.containsKey(player)) _glass.put(player, new ParticleKronosData(player)); - _glass.get(player).update(Manager.isMoving(player)); + _glass.get(player).update(_manager.isMoving(player)); } @EventHandler public void titanOwner(PlayerJoinEvent event) { - /*Until it becomes purchasable*/if (Manager.getClientManager().Get(event.getPlayer()).GetRank().equals(Rank.TITAN)) + /*Until it becomes purchasable*/if (_manager.getClientManager().Get(event.getPlayer()).GetRank().equals(Rank.TITAN)) //if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java index f99338a75..12ead8eb2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java @@ -40,9 +40,9 @@ public class ParticleLegend extends ParticleGadget public void legendOwner(PlayerJoinEvent event) { // TODO HARDCODED Legendary Aura Database Item Id - 552 - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) { - Manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(552, getName()), 1)); + _manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(552, getName()), 1)); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java index f781ff3c9..25fef8b4d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java @@ -32,7 +32,7 @@ public class ParticleWingsAngel extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java index ca1f4f584..089c0a121 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java @@ -34,7 +34,7 @@ public class ParticleWingsDemons extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { if (event.getType() == UpdateType.FASTEST) UtilParticle.playParticleFor(player, ParticleType.SMOKE, loc, 0.3f, 0.2f, 0.3f, 0, 10, ViewDist.NORMAL); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java index e5710f604..9e7f6694c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java @@ -32,7 +32,7 @@ public class ParticleWingsInfernal extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java index 3ad307040..9776ddec0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java @@ -38,7 +38,7 @@ public class ParticleWingsLove extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java index dd2003c9b..dcde0b02f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java @@ -32,7 +32,7 @@ public class ParticleWingsPixie extends ParticleGadget { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java index 19cd7705c..5f13b1e3c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java @@ -47,7 +47,7 @@ public class ParticleYinYang extends ParticleGadget RechargeData r = Recharge.Instance.Get(player).get("Yin and Yang Move"); - if(Manager.isMoving(player)) + if(_manager.isMoving(player)) { long time = 50; if(r != null) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java index 4d8b223fc..a6e76fd63 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java @@ -35,7 +35,7 @@ public class ParticleCandyCane extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - boolean moving = Manager.isMoving(player); + boolean moving = _manager.isMoving(player); Location loc = player.getLocation(); float y = moving ? 0.2f : 0.15f; double yadd = getY(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java index dea6a85aa..35fbfeb97 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java @@ -33,7 +33,7 @@ public class ParticleHeart extends ParticleGadget { if (event.getType() != UpdateType.FASTEST) return; - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { if(getSet() == null || !getSet().isActive(player)) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java index 417587dbb..6fefeb799 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java @@ -40,7 +40,7 @@ public class ParticleEmerald extends ParticleGadget if(getSet() == null || !getSet().isActive(player)) return; - if(Manager.isMoving(player)) + if(_manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.HAPPY_VILLAGER, player.getLocation().add(0, 0.2, 0), 0.3f, 0f, 0.3f, 0, 2, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java index bafa31183..577d6a981 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java @@ -38,7 +38,7 @@ public class ParticleFreedom extends ParticleGadget @Override public void startEffect(Player player) { - _effects.put(player.getUniqueId(), new FreedomFireworkEffect(player, Manager.getPlugin(), true)); + _effects.put(player.getUniqueId(), new FreedomFireworkEffect(player, _manager.getPlugin(), true)); _effects.get(player.getUniqueId()).start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java index 62c1388b3..4abe120c0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java @@ -30,7 +30,7 @@ public class ParticleFrostLord extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, player.getLocation().add(0, 1, 0), 0.2f, 0.2f, 0.2f, 0, 4, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java index f2c45007c..8d72f79ca 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java @@ -35,7 +35,7 @@ public class ParticleRain extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { UtilParticle.playParticleFor(player, ParticleType.SPLASH, player.getLocation(), 0.2f, 0, 0.2f, 0, 6, ViewDist.NORMAL); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java index 04874fffc..59332a626 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java @@ -29,7 +29,7 @@ public class ParticleMusic extends ParticleGadget @Override public void playParticle(Player player, UpdateEvent event) { - boolean moving = Manager.isMoving(player); + boolean moving = _manager.isMoving(player); UpdateType type = moving? UpdateType.FASTER : UpdateType.FAST; if (event.getType() != type) return; @@ -76,7 +76,7 @@ public class ParticleMusic extends ParticleGadget if(red == 0) red = 0.00001; double step2 = Math.PI/12; - if(Manager.isMoving(player)) step2 = Math.PI/2; + if(_manager.isMoving(player)) step2 = Math.PI/2; for(double rad2 = 0; rad2 < Math.PI*2; rad2 += step2) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java index 3aab6f928..27e62d969 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java @@ -57,7 +57,7 @@ public class ParticlePartyTime extends ParticleGadget for (int i = 0; i < 1; i++) { String particle = ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, list.get(i)); - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { UtilParticle.playParticleFor(player, particle, player.getLocation().add(0, 1, 0), null, 0.08f, 1, ViewDist.NORMAL); } @@ -82,7 +82,7 @@ public class ParticlePartyTime extends ParticleGadget _hiddenDrops.computeIfAbsent(player, key -> new HashSet<>()).add(item); DisguiseArmorStand stand = new DisguiseArmorStand(item); stand.setInvisible(true); - Manager.getDisguiseManager().disguise(stand); + _manager.getDisguiseManager().disguise(stand); String particle = ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, data); UtilParticle.playParticleFor(player, particle, spawnLoc, null, 0.08f, 30, ViewDist.NORMAL); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java index 9c3b8be54..8eae12cac 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java @@ -4,10 +4,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; -import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.Sound; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -50,7 +48,7 @@ public class ParticleFoot extends ParticleGadget _foot = !_foot; - if (!Manager.isMoving(player)) return; + if (!_manager.isMoving(player)) return; if (!UtilEnt.isGrounded(player)) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java index b5f02de23..d8984e476 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java @@ -49,7 +49,7 @@ public class ParticleTitan extends ParticleGadget double r = 3; boolean redstone = false; - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { UtilParticle.playParticleFor(player, ParticleType.FLAME, player.getLocation().add(0, 0.1, 0), 0.2f, 0.1f, 0.2f, 0.015f, 3, ViewDist.NORMAL); return; @@ -94,9 +94,9 @@ public class ParticleTitan extends ParticleGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java index a33078067..849dbff1b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java @@ -30,7 +30,7 @@ public class ParticleBlood extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { UtilParticle.playParticleFor(player, ParticleType.RED_DUST, player.getLocation().add(0, 1, 0), 0.2f, 0.2f, 0.2f, 0, 2, ViewDist.NORMAL); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java index f8d734e74..dbda9f2c4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java @@ -31,7 +31,7 @@ public class ParticleEnchant extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (Manager.isMoving(player)) + if (_manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.ENCHANTMENT_TABLE, player.getLocation().add(0, 1, 0), 0.2f, 0.2f, 0.2f, 0, 4, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java index 53e6a7793..145144147 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java @@ -68,7 +68,7 @@ public class EternalTaunt extends TauntGadget Bukkit.broadcastMessage(F.main("Taunt", F.name(player.getName()) + " waited so long they turned to bones.")); DisguiseSkeleton disguiseSkeleton = new DisguiseSkeleton(player); - UtilMorph.disguise(player, disguiseSkeleton, Manager); + UtilMorph.disguise(player, disguiseSkeleton, _manager); } @Override @@ -113,7 +113,7 @@ public class EternalTaunt extends TauntGadget @Override public void onFinish(Player player) { - UtilMorph.undisguise(player, Manager.getDisguiseManager()); + UtilMorph.undisguise(player, _manager.getDisguiseManager()); if (_clocks.containsKey(player.getUniqueId())) { _clocks.get(player.getUniqueId()).forEach(c -> c.remove()); @@ -125,9 +125,9 @@ public class EternalTaunt extends TauntGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ETERNAL)) + if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ETERNAL)) { - Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java index de81b6a1b..9628c38be 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java @@ -48,7 +48,7 @@ public class RainbowTaunt extends TauntGadget Location start = player.getLocation().clone().add(sideA.multiply(4).toLocation(player.getWorld())); Location end = player.getLocation().clone().add(sideB.multiply(4).toLocation(player.getWorld())); - RainbowTauntEffect rainbowTauntEffect = new RainbowTauntEffect(start, Manager.getPlugin()); + RainbowTauntEffect rainbowTauntEffect = new RainbowTauntEffect(start, _manager.getPlugin()); rainbowTauntEffect.setTargetLocation(new EffectLocation(end)); rainbowTauntEffect.start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java index d7d20aa75..2294fa0ed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java @@ -125,7 +125,7 @@ public class WinEffectBabyChicken extends WinEffectGadget { _chicken.getWorld().playSound(_chicken.getLocation(), Sound.CHICKEN_IDLE, 1, (float) (1 + Math.random()*0.6)); - Hologram hologram = new Hologram(Manager.getHologramManager(), _chicken.getEyeLocation(), C.Italics + "BAWK"); + Hologram hologram = new Hologram(_manager.getHologramManager(), _chicken.getEyeLocation(), C.Italics + "BAWK"); _text.put(hologram, Vector.getRandom().subtract(Vector.getRandom()).normalize().multiply(0.4).setY(0.6)); hologram.start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java index 18b3fb26d..a7e8199ed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java @@ -45,7 +45,7 @@ public class WinEffectFireworks extends WinEffectGadget start.setDirection(new Vector(1, 0, 0)); _npc = getNPC(_player, start); - AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); for(double rad = 0; rad < Math.PI*2; rad+= Math.PI/points) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java index 8a0760799..03f56b951 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java @@ -49,7 +49,7 @@ public class WinEffectFlames extends WinEffectGadget start.setDirection(new Vector(1, 0, 0)); _npc = getNPC(_player, start); - AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); for(double rad = 0; rad < Math.PI*2; rad+= Math.PI/points) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java index d40136327..be41eb54d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java @@ -173,11 +173,11 @@ public class WinEffectHalloween extends WinEffectGadget BabyFireworkEffect babyFireworkEffect; if (i %2 == 0) { - babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, Manager.getPlugin(), color); + babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, _manager.getPlugin(), color); } else { - babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, Manager.getPlugin(), Color.ORANGE, Color.BLACK); + babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, _manager.getPlugin(), Color.ORANGE, Color.BLACK); } // Starts without the firework trail babyFireworkEffect.setCount(6); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java index e159d74bd..3edd2858b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java @@ -29,7 +29,7 @@ public class WinEffectLightningStrike extends WinEffectGadget public void play() { final DisguisePlayer player = getNPC(this._player, getBaseLocation()); - Bukkit.getScheduler().runTaskLater(Manager.getPlugin(), + Bukkit.getScheduler().runTaskLater(_manager.getPlugin(), new Runnable() { public void run() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java index 9b31c73fa..3164313ba 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java @@ -50,7 +50,7 @@ public class WinEffectLoveIsABattlefield extends WinEffectGadget { _npc = getNPC(this._player, getBaseLocation()); - AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); animator.addPoint(new AnimationPoint(20, new Vector(0,0,0), new Vector(-1, 0.5, 0))); animator.addPoint(new AnimationPoint(40, new Vector(0,0,0), new Vector( 0, 0.5,-1))); @@ -103,7 +103,7 @@ public class WinEffectLoveIsABattlefield extends WinEffectGadget @Override public void finish() { - Manager.getDisguiseManager().undisguise(_npc); + _manager.getDisguiseManager().undisguise(_npc); _npc = null; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java index 3dc52ff95..90a17799b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java @@ -32,7 +32,7 @@ public class WinEffectPodium extends WinEffectGadget { _npc = getNPC(this._player, getBaseLocation()); - AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); animator.addPoint(new AnimationPoint( 20, new Vector(0,0,0), new Vector(-1, 0.5, 0))); animator.addPoint(new AnimationPoint( 40, new Vector(0,0,0), new Vector( 0, 0.5,-1))); @@ -78,7 +78,7 @@ public class WinEffectPodium extends WinEffectGadget @Override public void finish() { - Manager.getDisguiseManager().undisguise(_npc); + _manager.getDisguiseManager().undisguise(_npc); _npc = null; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java index 6539f59c0..2304574df 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java @@ -62,7 +62,7 @@ public class WinEffectRiseOfTheElderGuardian extends WinEffectGadget stand.setGravity(false); DisguiseGuardian g = new DisguiseGuardian(stand); - Manager.getDisguiseManager().disguise(g); + _manager.getDisguiseManager().disguise(g); _guardians.add(g); } @@ -91,7 +91,7 @@ public class WinEffectRiseOfTheElderGuardian extends WinEffectGadget for(DisguiseGuardian g : _guardians) { g.setTarget(_npcPlayer.getEntityId()); - Manager.getDisguiseManager().updateDisguise(g); + _manager.getDisguiseManager().updateDisguise(g); } } @@ -113,17 +113,17 @@ public class WinEffectRiseOfTheElderGuardian extends WinEffectGadget for(DisguiseGuardian g : _guardians) { g.setTarget(0); - Manager.getDisguiseManager().updateDisguise(g); + _manager.getDisguiseManager().updateDisguise(g); } ArmorStand stand = (ArmorStand) _npcPlayer.getEntity().getBukkitEntity(); - Manager.getDisguiseManager().undisguise(stand); + _manager.getDisguiseManager().undisguise(stand); _npcGuardian = new DisguiseGuardian(stand); _npcGuardian.setElder(true); - Manager.getDisguiseManager().disguise(_npcGuardian); + _manager.getDisguiseManager().disguise(_npcGuardian); } _tick++; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java index 42a8c5115..f0edca603 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java @@ -48,7 +48,7 @@ public class WinEffectSnowTrails extends WinEffectGadget start.setDirection(new Vector(1, 0, 0)); _npc = getNPC(_player, start); - AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); for(double rad = 0; rad < Math.PI*2; rad+= Math.PI/points) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java index 67a9abe9c..bf9ef4fcd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java @@ -76,7 +76,7 @@ public class WinEffectWinterWarfare extends WinEffectGadget @Override public void finish() { - Manager.getDisguiseManager().undisguise(_npc); + _manager.getDisguiseManager().undisguise(_npc); _npc = null; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java index 4d3b5b0d4..735047344 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java @@ -29,7 +29,7 @@ public abstract class ArrowEffectGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (Manager.hideParticles()) + if (_manager.hideParticles()) return false; return true; @@ -38,7 +38,7 @@ public abstract class ArrowEffectGadget extends Gadget @EventHandler public void arrowLaunch(ProjectileLaunchEvent event) { - if (Manager.hideParticles()) + if (_manager.hideParticles()) return; if (event.getEntity() instanceof Arrow) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java index 4a5ad6f60..3d97ba38f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java @@ -49,7 +49,7 @@ public abstract class BalloonGadget extends Gadget } else { - Manager.removeActive(player, this); + _manager.removeActive(player, this); UtilPlayer.message(player, F.main("Gadget", "You cannot have more than " + F.count("10") + " balloons!")); } } @@ -152,7 +152,7 @@ public abstract class BalloonGadget extends Gadget if (event.getFrom().getY() > 0) return; - for (BalloonGadget balloonGadget : Manager.getActiveBalloons(event.getPlayer())) + for (BalloonGadget balloonGadget : _manager.getActiveBalloons(event.getPlayer())) { balloonGadget.disable(event.getPlayer(), false); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java index 35eeb4737..7aafae5a6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java @@ -20,7 +20,7 @@ public abstract class DeathEffectGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (Manager.hideParticles()) + if (_manager.hideParticles()) return false; return true; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java index e1076dba7..6d2ffbb37 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java @@ -20,7 +20,7 @@ public abstract class DoubleJumpEffectGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (Manager.hideParticles()) + if (_manager.hideParticles()) return false; return true; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java index 141885d0c..b165ed3ff 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java @@ -22,20 +22,16 @@ import mineplex.core.shop.item.SalesPackageBase; public abstract class Gadget extends SalesPackageBase implements Listener { - public GadgetManager Manager; + public GadgetManager _manager; private GadgetType _gadgetType; protected HashSet _active = new HashSet<>(); - protected GadgetSet _set = null; private String[] _alternativePackageNames; - - private boolean _free; - + private boolean _freeGadget; private YearMonth _yearMonth = null; - private ItemStack _displayItem = null; public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data) @@ -53,15 +49,15 @@ public abstract class Gadget extends SalesPackageBase implements Listener super(name, mat, data, desc, cost, quantity); _gadgetType = gadgetType; - KnownPackage = false; - _free = false; + _knownPackage = false; + _freeGadget = false; _alternativePackageNames = alternativesalepackageNames; if(_alternativePackageNames == null) { _alternativePackageNames = new String[0]; } - Manager = manager; + _manager = manager; - Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin()); + _manager.getPlugin().getServer().getPluginManager().registerEvents(this, _manager.getPlugin()); } public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data, YearMonth yearMonth, int quantity, String... alternativesalepackageNames) @@ -69,32 +65,32 @@ public abstract class Gadget extends SalesPackageBase implements Listener super(name, mat, data, desc, cost, quantity); _gadgetType = gadgetType; - KnownPackage = false; - _free = false; + _knownPackage = false; + _freeGadget = false; _yearMonth = yearMonth; _alternativePackageNames = alternativesalepackageNames; if(_alternativePackageNames == null) { _alternativePackageNames = new String[0]; } - Manager = manager; + _manager = manager; - Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin()); + _manager.getPlugin().getServer().getPluginManager().registerEvents(this, _manager.getPlugin()); } - public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data, int quantity, boolean free, String... alternativesalepackageNames) + public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data, int quantity, boolean freeGadget, String... alternativesalepackageNames) { super(name, mat, data, desc, cost, quantity); _gadgetType = gadgetType; - KnownPackage = false; - _free = free; + _knownPackage = false; + _freeGadget = freeGadget; _alternativePackageNames = alternativesalepackageNames; if(_alternativePackageNames == null) { _alternativePackageNames = new String[0]; } - Manager = manager; + _manager = manager; - Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin()); + _manager.getPlugin().getServer().getPluginManager().registerEvents(this, _manager.getPlugin()); } public GadgetType getGadgetType() @@ -141,7 +137,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener return; } - Manager.setActive(player, this); + _manager.setActive(player, this); enableCustom(player, message); Bukkit.getServer().getPluginManager().callEvent(new GadgetAppliedEvent(player, this)); } @@ -161,7 +157,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener { if (isActive(player)) { - Manager.removeActive(player, this); + _manager.removeActive(player, this); GadgetDisableEvent event = new GadgetDisableEvent(player, this); Bukkit.getServer().getPluginManager().callEvent(event); disableCustom(player, message); @@ -170,7 +166,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener public void enableCustom(Player player, boolean message) { - Manager.removeGadgetType(player, _gadgetType, this); + _manager.removeGadgetType(player, _gadgetType, this); _active.add(player); if (message) UtilPlayer.message(player, F.main("Gadget", "You enabled " + F.elem(getName()) + ".")); @@ -184,14 +180,14 @@ public abstract class Gadget extends SalesPackageBase implements Listener public boolean ownsGadget(Player player) { - if(isFree() || _free) { return true; } - if(Manager.getDonationManager().Get(player).ownsUnknownSalesPackage(getName())) { return true; } - if(Manager.getInventoryManager().Get(player).getItemCount(getName()) > 0) { return true; } + if(isFree() || _freeGadget) { return true; } + if(_manager.getDonationManager().Get(player).ownsUnknownSalesPackage(getName())) { return true; } + if(_manager.getInventoryManager().Get(player).getItemCount(getName()) > 0) { return true; } for(String alt : _alternativePackageNames) { - if(Manager.getDonationManager().Get(player).ownsUnknownSalesPackage(alt)) { return true; } - if(Manager.getInventoryManager().Get(player).getItemCount(alt) > 0) { return true; } + if(_manager.getDonationManager().Get(player).ownsUnknownSalesPackage(alt)) { return true; } + if(_manager.getInventoryManager().Get(player).getItemCount(alt) > 0) { return true; } } return false; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java index b6becadc1..7684c5f5d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java @@ -46,9 +46,9 @@ public abstract class HatGadget extends OutfitGadget public void applyArmor(Player player, boolean message) { - Manager.removeGadgetType(player, GadgetType.MORPH, this); + _manager.removeGadgetType(player, GadgetType.MORPH, this); - Manager.removeOutfit(player, _slot); + _manager.removeOutfit(player, _slot); _active.add(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java index 82a685892..693bafc8f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java @@ -1,5 +1,6 @@ package mineplex.core.gadget.types; +import java.time.YearMonth; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -40,7 +41,17 @@ public abstract class ItemGadget extends Gadget _ammo = ammo; _recharge = recharge; - Free = true; + this._free = true; + } + + public ItemGadget(GadgetManager manager, String name, String[] desc, int cost, Material mat, byte data, + long recharge, Ammo ammo, YearMonth yearMonth) + { + super(manager, GadgetType.ITEM, name, desc, cost, mat, data, yearMonth); + + _ammo = ammo; + _recharge = recharge; + this._free = true; } public ItemGadget(GadgetManager manager, String name, String[] desc, int cost, Material mat, byte data, @@ -75,16 +86,16 @@ public abstract class ItemGadget extends Gadget public void ApplyItem(Player player, boolean inform) { - Manager.removeGadgetType(player, GadgetType.ITEM, this); + _manager.removeGadgetType(player, GadgetType.ITEM, this); _active.add(player); List itemLore = new ArrayList(); itemLore.addAll(Arrays.asList(getDescription())); itemLore.add(C.cBlack); - itemLore.add(C.cWhite + "Your Ammo : " + Manager.getInventoryManager().Get(player).getItemCount(getName())); + itemLore.add(C.cWhite + "Your Ammo : " + _manager.getInventoryManager().Get(player).getItemCount(getName())); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); if (inform) UtilPlayer.message(player, F.main("Gadget", "You equipped " + F.elem(getName()) + ".")); @@ -100,14 +111,14 @@ public abstract class ItemGadget extends Gadget final Player player = event.getPlayer(); - Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() { public void run() { if (player.isOnline()) { player.getInventory().remove(getDisplayMaterial()); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); UtilInv.Update(player); } } @@ -119,7 +130,7 @@ public abstract class ItemGadget extends Gadget { if (_active.remove(player)) { - player.getInventory().setItem(Manager.getActiveItemSlot(), null); + player.getInventory().setItem(_manager.getActiveItemSlot(), null); if (message) UtilPlayer.message(player, F.main("Gadget", "You unequipped " + F.elem(getName()) + ".")); @@ -156,7 +167,7 @@ public abstract class ItemGadget extends Gadget event.setCancelled(true); //Stock - if (!hasAmmo(player)) + if (!hasAmmo(player) && !_ammo.isFree()) { UtilPlayer.message(player, F.main("Gadget", "You do not have any " + getName() + " left.")); @@ -183,16 +194,17 @@ public abstract class ItemGadget extends Gadget return; } - Manager.getInventoryManager().addItemToInventory(player, getName(), -1); + if (!_ammo.isFree()) + _manager.getInventoryManager().addItemToInventory(player, getName(), -1); - player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); ActivateCustom(event.getPlayer()); } public boolean hasAmmo(Player player) { - return Manager.getInventoryManager().Get(player).getItemCount(getName()) > 0; + return _manager.getInventoryManager().Get(player).getItemCount(getName()) > 0; } public abstract void ActivateCustom(Player player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java index ff08e8152..f681fe3bd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java @@ -25,7 +25,7 @@ public abstract class MorphGadget extends Gadget public void applyArmor(Player player, boolean message) { - Manager.removeGadgetType(player, GadgetType.MORPH, this); + _manager.removeGadgetType(player, GadgetType.MORPH, this); _active.add(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java index 708e5e5a6..5f8df9f09 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java @@ -51,7 +51,7 @@ public class MusicGadget extends Gadget return; } - if (!Manager.canPlaySongAt(player.getLocation())) + if (!_manager.canPlaySongAt(player.getLocation())) { UtilPlayer.message(player, F.main("Music", "There is already a song playing.")); return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java index 6ce4d70b7..2ddae9ad4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java @@ -59,9 +59,9 @@ public abstract class OutfitGadget extends Gadget public void applyArmor(Player player, boolean message) { - Manager.removeGadgetType(player, GadgetType.MORPH, this); + _manager.removeGadgetType(player, GadgetType.MORPH, this); - Manager.removeOutfit(player, _slot); + _manager.removeOutfit(player, _slot); _active.add(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 06af3908b..68e60f9b0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java @@ -33,7 +33,7 @@ public abstract class ParticleGadget extends Gadget @Override public void enableCustom(Player player, boolean message) { - Manager.removeGadgetType(player, GadgetType.PARTICLE, this); + _manager.removeGadgetType(player, GadgetType.PARTICLE, this); _active.add(player); startEffect(player); if (message) @@ -55,7 +55,7 @@ public abstract class ParticleGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (Manager.hideParticles()) + if (_manager.hideParticles()) return false; return true; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java index 403161cc9..a119e7162 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java @@ -123,7 +123,7 @@ public abstract class WinEffectGadget extends Gadget // Loads gadgets back when players are teleported to the arcade hub, after the win effect for (Player player : UtilServer.getPlayers()) { - Manager.getUserGadgetPersistence().load(player); + _manager.getUserGadgetPersistence().load(player); } } } @@ -310,7 +310,7 @@ public abstract class WinEffectGadget extends Gadget profile.getProperties().putAll(((CraftPlayer) player).getHandle().getProfile().getProperties()); DisguisePlayer disguise = new DisguisePlayer(stand, profile); - Manager.getDisguiseManager().disguise(disguise); + _manager.getDisguiseManager().disguise(disguise); return disguise; } @@ -334,7 +334,7 @@ public abstract class WinEffectGadget extends Gadget profile.getProperties().put("textures", skinData.getProperty()); DisguisePlayer disguise = new DisguisePlayer(stand, profile); - Manager.getDisguiseManager().disguise(disguise); + _manager.getDisguiseManager().disguise(disguise); return disguise; } @@ -465,7 +465,7 @@ public abstract class WinEffectGadget extends Gadget */ protected String getRank(Player player) { - return Manager.getClientManager().Get(player).getRealOrDisguisedRank().getTag(true, true) + " " + C.Reset; + return _manager.getClientManager().Get(player).getRealOrDisguisedRank().getTag(true, true) + " " + C.Reset; } public int getGameTime() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java index 242e21dfa..3ab15c9f8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java @@ -12,7 +12,7 @@ public class DragonMount extends Mount { super (manager, name, displayMaterial, displayData, desc, cost); - KnownPackage = false; + _knownPackage = false; } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java index f383958b4..edb368243 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java @@ -36,7 +36,7 @@ public class HorseMount extends Mount> public HorseMount(MountManager manager, String name, String[] desc, Material displayMaterial, byte displayData, int cost, Color color, Style style, Variant variant, double jump, Material armor) { super (manager, name, displayMaterial, displayData, desc, cost); - KnownPackage = false; + _knownPackage = false; _color = color; _style = style; @@ -48,7 +48,7 @@ public class HorseMount extends Mount> public HorseMount(MountManager manager, String name, String[] desc, Material displayMaterial, byte displayData, int cost, Color color, Style style, Variant variant, double jump, Material armor, YearMonth yearMonth) { super (manager, name, displayMaterial, displayData, desc, cost, yearMonth); - KnownPackage = false; + _knownPackage = false; _color = color; _style = style; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java index a1f9f5a5b..d9c605cc3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java @@ -33,7 +33,7 @@ public class MountCart extends Mount> UtilText.splitLineToArray(C.cGray + "Cruise around town in your shiny new Minecart RX Turbo!", LineFormat.LORE), 15000); - KnownPackage = false; + _knownPackage = false; } public void enableCustom(Player player) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java index 265601406..8bcc250ef 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java @@ -34,7 +34,7 @@ public class MountSlime extends Mount> UtilText.splitLineToArray(C.cGray + "Bounce around on your very own slime friend!", LineFormat.LORE), 15000); - KnownPackage = false; + _knownPackage = false; } public void enableCustom(Player player) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java index 066521459..e49e1e453 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java @@ -23,7 +23,7 @@ public class BlowAKissEffect extends Effect public BlowAKissEffect(Player player, Location target, Gadget gadget) { - super(-1, new EffectLocation(player), gadget.Manager.getPlugin()); + super(-1, new EffectLocation(player), gadget._manager.getPlugin()); _gadget = gadget; _player = player; setTargetLocation(new EffectLocation(target)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java index 85c293e6f..718816efc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java @@ -28,7 +28,7 @@ public class LoveDoctorEffect extends Effect public LoveDoctorEffect(Player player, Location target, Gadget gadget) { - super(-1, new EffectLocation(player), gadget.Manager.getPlugin()); + super(-1, new EffectLocation(player), gadget._manager.getPlugin()); _gadget = gadget; _player = player; setTargetLocation(new EffectLocation(target)); @@ -79,7 +79,7 @@ public class LoveDoctorEffect extends Effect HashMap players = UtilPlayer.getInRadius(loc, 9d); for (Player ent : players.keySet()) { - if (_gadget.Manager.collideEvent(_player, _gadget, ent)) + if (_gadget._manager.collideEvent(_player, _gadget, ent)) continue; double mult = players.get(ent); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java index d9382e15e..abb66a52c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java @@ -34,7 +34,7 @@ public class MetalManEffect extends Effect public MetalManEffect(Location location, Location target, int color, Gadget gadget, Player player) { - super(-1, new EffectLocation(player), gadget.Manager.getPlugin()); + super(-1, new EffectLocation(player), gadget._manager.getPlugin()); _color = color; _gadget = gadget; _player = player; @@ -105,7 +105,7 @@ public class MetalManEffect extends Effect HashMap players = UtilPlayer.getInRadius(loc, 9d); for (Player ent : players.keySet()) { - if (_gadget.Manager.collideEvent(_player, _gadget, ent)) + if (_gadget._manager.collideEvent(_player, _gadget, ent)) continue; double mult = players.get(ent); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java index 206e64a8f..91cd9e9d4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java @@ -11,9 +11,9 @@ public class PetExtraSalesPackage extends SalesPackageBase public PetExtraSalesPackage(String name, Material material, int price) { super(name, material, (byte)0, new String[0]); - CurrencyCostMap.put(GlobalCurrency.TREASURE_SHARD, price); + _currencyCostMap.put(GlobalCurrency.TREASURE_SHARD, price); - KnownPackage = false; - OneTimePurchaseOnly = false; + _knownPackage = false; + _oneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java index 2189e1469..84c606bc5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java @@ -14,8 +14,8 @@ public class PetSalesPackage extends SalesPackageBase public PetSalesPackage(PetType type, String tagName) { super(type.getName(), Material.MONSTER_EGG, (byte)type.getEntityType().getTypeId(), new String[0]); - CurrencyCostMap.put(GlobalCurrency.TREASURE_SHARD, type.getPrice()); - KnownPackage = false; + _currencyCostMap.put(GlobalCurrency.TREASURE_SHARD, type.getPrice()); + _knownPackage = false; setDisplayName(C.cGreen + "Purchase " + tagName); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java index 9290244de..f17874141 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java @@ -1,28 +1,29 @@ package mineplex.core.shop.item; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + import mineplex.core.common.currency.GlobalCurrency; import mineplex.core.common.util.NautHashMap; import mineplex.core.donation.repository.GameSalesPackageToken; import mineplex.core.itemstack.ItemBuilder; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPackage { private Material _displayMaterial; private byte _displayData; - protected String Name; - protected String DisplayName; - protected String[] Description; - protected int Quantity; + protected String _name; + protected String _displayName; + protected String[] _description; + protected int _quantity; - protected int SalesPackageId; - protected boolean Free; - protected NautHashMap CurrencyCostMap; - protected boolean KnownPackage = true; - protected boolean OneTimePurchaseOnly = true; + protected int _salesPackageId; + protected boolean _free; + protected NautHashMap _currencyCostMap; + protected boolean _knownPackage = true; + protected boolean _oneTimePurchaseOnly = true; public SalesPackageBase(String name, Material material, String...description) { @@ -41,46 +42,46 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack public SalesPackageBase(String name, Material material, byte displayData, String[] description, int coins, int quantity) { - CurrencyCostMap = new NautHashMap<>(); + _currencyCostMap = new NautHashMap<>(); - Name = name; - DisplayName = name; - Description = description; + _name = name; + _displayName = name; + _description = description; _displayMaterial = material; _displayData = displayData; - CurrencyCostMap.put(GlobalCurrency.TREASURE_SHARD, coins); - Quantity = quantity; + _currencyCostMap.put(GlobalCurrency.TREASURE_SHARD, coins); + _quantity = quantity; } @Override public String getName() { - return Name; + return _name; } @Override public String[] getDescription() { - return Description; + return _description; } @Override public int getCost(GlobalCurrency currencyType) { - return CurrencyCostMap.containsKey(currencyType) ? CurrencyCostMap.get(currencyType) : 0; + return _currencyCostMap.containsKey(currencyType) ? _currencyCostMap.get(currencyType) : 0; } @Override public int getSalesPackageId() { - return SalesPackageId; + return _salesPackageId; } @Override public boolean isFree() { - return Free; + return _free; } @Override @@ -98,42 +99,42 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack @Override public void update(GameSalesPackageToken token) { - SalesPackageId = token.GameSalesPackageId; - Free = token.Free; + _salesPackageId = token.GameSalesPackageId; + _free = token.Free; if (token.Gems > 0) { - CurrencyCostMap.put(GlobalCurrency.GEM, token.Gems); + _currencyCostMap.put(GlobalCurrency.GEM, token.Gems); } } public int getQuantity() { - return Quantity; + return _quantity; } public boolean isKnown() { - return KnownPackage; + return _knownPackage; } public boolean oneTimePurchase() { - return OneTimePurchaseOnly; + return _oneTimePurchaseOnly; } public String getDisplayName() { - return DisplayName; + return _displayName; } public void setDisplayName(String name) { - DisplayName = name; + _displayName = name; } public ItemStack buildIcon() { - return new ItemBuilder(_displayMaterial).setData(_displayData).setTitle(DisplayName).addLore(Description).build(); + return new ItemBuilder(_displayMaterial).setData(_displayData).setTitle(_displayName).addLore(_description).build(); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java index bd4162932..198eb3098 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java @@ -9,7 +9,7 @@ public class ChestPackage extends SalesPackageBase { super(name, mat, (byte) 0, new String[] {}, cost); - KnownPackage = false; - OneTimePurchaseOnly = false; + _knownPackage = false; + _oneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java index 30ef863f6..bdf9748cc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java @@ -13,7 +13,7 @@ public class TreasureKey extends SalesPackageBase { super("Treasure Key", Material.TRIPWIRE_HOOK, (byte) 0, new String[] { ChatColor.RESET + "Used to open Treasure Chests" }, 1000); - KnownPackage = false; - OneTimePurchaseOnly = false; + _knownPackage = false; + _oneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java index bc31e43e6..0568d831c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java @@ -17,7 +17,7 @@ public class SelectBullsChargeGoal extends ObjectiveGoal { public SelectBullsChargeGoal(ClassesObjective objective) { - super(objective, "Open Class Manager", "Using the Class Manager, choose Bulls Charge for your Axe Skill"); + super(objective, "Open Class Manager", "Using the Class _manager, choose Bulls Charge for your Axe Skill"); } @Override diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java index 55e32d4bf..56c0e01c3 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java @@ -65,7 +65,7 @@ public class TextManager extends MiniPlugin UtilBlockText.MakeText("CAPTURE THE FLAG", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); // UtilBlockText.MakeText("CLANS", locComp.clone().add(15, 28, 0), faceComp, 159, (byte)14, TextAlign.CENTER); -// UtilBlockText.MakeText("CLANS", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); +// UtilBlockText.MakeText("CLANS", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); //Arcade UtilBlockText.MakeText("ARCADE", locArcade, faceArcade, 159, (byte)5, TextAlign.CENTER); @@ -115,13 +115,13 @@ public class TextManager extends MiniPlugin return; UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 15), faceArcade, 159, (byte)4, TextAlign.CENTER); - UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 15), faceArcade, 159, (byte)1, TextAlign.CENTER); - UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 15), faceArcade, 159, (byte)14, TextAlign.CENTER); - UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); arcadeIndex = (arcadeIndex + 3)%arcadeGames.length; } @@ -149,13 +149,13 @@ public class TextManager extends MiniPlugin if (smashIndex == 1) color = 0; //UtilText.MakeText("SUPER SMASH MOBS", locOther, faceOther, 159, color, TextAlign.CENTER); - //UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 0, -1), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + //UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 0, -1), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -15), faceOther, 159, color, TextAlign.CENTER); - UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -16), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -16), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText("DOMINATE", locComp.clone().add(15, 14, 0), faceComp, 159, color, TextAlign.CENTER); - UtilText.MakeText("DOMINATE", locComp.clone().add(16, 14, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText("DOMINATE", locComp.clone().add(16, 14, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); //System.out.println("TextCreator : " + (System.currentTimeMillis() - startTime) + "ms"); } */ diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java index 3ce30af02..0e9da60d7 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java @@ -10,8 +10,8 @@ public class ItemSalesPackage extends SalesPackageBase public ItemSalesPackage(Item item) { super("Champions " + item.GetName(), Material.BOOK, (byte)0, item.GetDesc(), item.GetGemCost()); - Free = item.isFree(); - KnownPackage = false; - CurrencyCostMap.put(GlobalCurrency.GEM, item.GetGemCost()); + _free = item.isFree(); + _knownPackage = false; + _currencyCostMap.put(GlobalCurrency.GEM, item.GetGemCost()); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java index 420427e31..54b3a181b 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java @@ -10,8 +10,8 @@ public class SkillSalesPackage extends SalesPackageBase public SkillSalesPackage(ISkill skill) { super("Champions " + skill.GetName(), Material.BOOK, (byte)0, skill.GetDesc(0), skill.GetGemCost()); - Free = skill.IsFree(); - KnownPackage = false; - CurrencyCostMap.put(GlobalCurrency.GEM, skill.GetGemCost()); + _free = skill.IsFree(); + _knownPackage = false; + _currencyCostMap.put(GlobalCurrency.GEM, skill.GetGemCost()); } } diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java index fcfa571e1..10dde2ab1 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java @@ -194,7 +194,7 @@ public class ConditionFactory public Condition Vulnerable(String reason, LivingEntity ent, LivingEntity source, double duration, int mult, boolean extend, boolean showIndicator, boolean ambient) { - return Manager.AddCondition(new Vulnerability(Manager, reason, ent, source, + return Manager.AddCondition(new Vulnerability(_manager, reason, ent, source, ConditionType.WITHER, mult, (int)(20 * duration), extend, Material.BONE, (byte)0, showIndicator, ambient)); } 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 68767903c..12e28e680 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 @@ -853,7 +853,7 @@ public class EventGame extends Game } if(command.contentEquals("[EFFECT]")) { - //Manager.GetEventModule().commandEffect(Manager.GetGameHostManager().getHost(), commandArgs, varMap.get(1)); + //Manager.GetEventModule().commandEffect(_manager.GetGameHostManager().getHost(), commandArgs, varMap.get(1)); for(Player player : varMap.get(1)) { player.addPotionEffect(new PotionEffect(PotionEffectType.getByName(args[2]), Integer.parseInt(args[3].split(" ")[0]), Integer.parseInt(args[3].split(" ")[1]))); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java index d4831cbbb..70be9fded 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java @@ -70,7 +70,7 @@ public class KitSkeleton // { // event.setCancelled(true); // -// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() +// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() // { // @Override // public void run() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java index fcf33d0aa..13be5a6cb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java @@ -70,7 +70,7 @@ public class KitSnowman // { // event.setCancelled(true); // -// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() +// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() // { // @Override // public void run() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java index 5d63023a5..bc49dd5b9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java @@ -230,7 +230,7 @@ public class PerkDestructor extends Perk // @EventHandler // public void collide(PlayerTeleportEvent event) // { -// if (Manager.GetGame() == null || !Manager.GetGame().IsLive()) +// if (Manager.GetGame() == null || !_manager.GetGame().IsLive()) // return; // // if (event.getCause() != TeleportCause.ENDER_PEARL) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java index 0157bf271..78714db86 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java @@ -89,7 +89,7 @@ public class PerkSquidRifle extends Perk implements IThrown //_fireworks.put(fw, vel); //Projectile - //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, Manager.GetDisguise()); + //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, _manager.GetDisguise()); } catch (Exception e) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java index 797468967..cea32dd65 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java @@ -96,7 +96,7 @@ public class PerkSquidShotgun extends Perk implements IThrown //_fireworks.put(fw, vel); //Projectile - //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, Manager.GetDisguise()); + //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, _manager.GetDisguise()); } catch (Exception e) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java index 96b38e418..c4d864c88 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java @@ -89,7 +89,7 @@ public class PerkSquidSniper extends Perk implements IThrown //_fireworks.put(fw, vel); //Projectile - //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, Manager.GetDisguise()); + //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, _manager.GetDisguise()); } catch (Exception e) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java index 6fbea37dc..5a8c75f54 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java @@ -9,7 +9,7 @@ public class KitPackage extends SalesPackageBase public KitPackage(String gameName, Kit kit) { super(gameName + " " + kit.GetName(), kit.getDisplayMaterial(), kit.GetDesc()); - KnownPackage = false; - CurrencyCostMap.put(GlobalCurrency.GEM, kit.GetCost()); + _knownPackage = false; + _currencyCostMap.put(GlobalCurrency.GEM, kit.GetCost()); } } From 788326fe54675a9ac0991a5782dbe51ac47f8eda Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Wed, 22 Mar 2017 13:11:14 -0300 Subject: [PATCH 02/91] Tried with armorstands, still not working :( --- .../gadget/gadgets/item/ItemBubbleBlaster.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java index 71b5f37b8..eeea8cb12 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java @@ -5,12 +5,13 @@ import java.time.YearMonth; import org.bukkit.Material; import org.bukkit.block.Block; -import org.bukkit.entity.Item; +import org.bukkit.entity.ArmorStand; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.ItemStack; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -74,12 +75,16 @@ public class ItemBubbleBlaster extends ItemGadget implements IThrown // TODO CHANGE COLOR IF RAINBOW // TODO COOLDOWN AFTER MAX OF 5 SECONDS HOLDING // TODO LAUNCH MULTIPLE WHILE HOLDING - Item item = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS, (byte) UtilMath.random.nextInt(15))); + //Item item = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS, (byte) UtilMath.random.nextInt(15))); - UtilAction.velocity(item, player.getLocation().getDirection(), - 1, false, 0, 0.2, 10, false); + ArmorStand armorStand = player.getWorld().spawn(player.getLocation(), ArmorStand.class); + armorStand.setItemInHand(new ItemStack(Material.STAINED_GLASS, 1, (byte) UtilMath.random.nextInt(15))); + armorStand.setSmall(true); + armorStand.setVisible(false); - _manager.getProjectileManager().AddThrow(item, player, this, 1000, false, false, false, false, false, 0f); +// _manager.getProjectileManager().AddThrow(item, player, this, 1000, false, false, false, false, 0f); +// + UtilAction.velocity(armorStand, player.getLocation().getDirection(), 1, false, 0, 0.7, 10, false); } @Override From 49bc6b8663d3ab227cccc4d8b842de535c3df113 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Wed, 22 Mar 2017 14:42:11 -0300 Subject: [PATCH 03/91] Removed gravity --- .../mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java index eeea8cb12..507a32e75 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java @@ -5,6 +5,7 @@ import java.time.YearMonth; import org.bukkit.Material; import org.bukkit.block.Block; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArmorStand; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -81,6 +82,7 @@ public class ItemBubbleBlaster extends ItemGadget implements IThrown armorStand.setItemInHand(new ItemStack(Material.STAINED_GLASS, 1, (byte) UtilMath.random.nextInt(15))); armorStand.setSmall(true); armorStand.setVisible(false); + ((CraftArmorStand) armorStand).getHandle().setGravity(false); // _manager.getProjectileManager().AddThrow(item, player, this, 1000, false, false, false, false, 0f); // From 3b48a7caaf9e4e1172bdcf6de45d5d3558d048f2 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Wed, 22 Mar 2017 16:55:49 -0300 Subject: [PATCH 04/91] Update armorstand to make it never fall --- .../gadgets/item/ItemBubbleBlaster.java | 53 ++++++++++--------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java index 507a32e75..c6701c2ee 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java @@ -2,12 +2,12 @@ package mineplex.core.gadget.gadgets.item; import java.time.Month; import java.time.YearMonth; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_8_R3.entity.CraftArmorStand; import org.bukkit.entity.ArmorStand; -import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; @@ -26,12 +26,14 @@ import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.Ammo; import mineplex.core.gadget.types.ItemGadget; import mineplex.core.itemstack.ItemStackFactory; -import mineplex.core.projectile.IThrown; -import mineplex.core.projectile.ProjectileUser; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; -public class ItemBubbleBlaster extends ItemGadget implements IThrown +public class ItemBubbleBlaster extends ItemGadget { + private Map _armorStands = new HashMap<>(); + public ItemBubbleBlaster(GadgetManager manager) { super(manager, "Bubble Blaster", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE), @@ -76,35 +78,36 @@ public class ItemBubbleBlaster extends ItemGadget implements IThrown // TODO CHANGE COLOR IF RAINBOW // TODO COOLDOWN AFTER MAX OF 5 SECONDS HOLDING // TODO LAUNCH MULTIPLE WHILE HOLDING - //Item item = player.getWorld().dropItem(player.getEyeLocation().add(player.getLocation().getDirection()), ItemStackFactory.Instance.CreateStack(Material.STAINED_GLASS, (byte) UtilMath.random.nextInt(15))); ArmorStand armorStand = player.getWorld().spawn(player.getLocation(), ArmorStand.class); armorStand.setItemInHand(new ItemStack(Material.STAINED_GLASS, 1, (byte) UtilMath.random.nextInt(15))); armorStand.setSmall(true); armorStand.setVisible(false); - ((CraftArmorStand) armorStand).getHandle().setGravity(false); -// _manager.getProjectileManager().AddThrow(item, player, this, 1000, false, false, false, false, 0f); -// - UtilAction.velocity(armorStand, player.getLocation().getDirection(), 1, false, 0, 0.7, 10, false); + _armorStands.put(armorStand, player); + + UtilAction.velocity(armorStand, player.getLocation().getDirection(), 1, false, 0, 0.25, 5, false); } - @Override - public void Collide(LivingEntity target, Block block, ProjectileUser data) + @EventHandler + public void updateArmorStand(UpdateEvent event) { + if (event.getType() != UpdateType.TICK) + return; - } - - @Override - public void Idle(ProjectileUser data) - { - - } - - @Override - public void Expire(ProjectileUser data) - { - data.getThrown().remove(); + Iterator> iterator = _armorStands.entrySet().iterator(); + while (iterator.hasNext()) + { + Map.Entry entry = iterator.next(); + ArmorStand armorStand = entry.getKey(); + Player player = entry.getValue(); + UtilAction.velocity(armorStand, armorStand.getLocation().getDirection(), 1, false, 0, 0.25, 0, false); + if (armorStand.getTicksLived() >= 20) + { + armorStand.remove(); + iterator.remove(); + } + } } } From 64ed3e2e1bc50040f14fa275f9531e10649a4509 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Fri, 24 Mar 2017 13:45:36 -0300 Subject: [PATCH 05/91] Still trying with armor stands... --- .../gadget/gadgets/item/ItemBubbleBlaster.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java index c6701c2ee..ff0ba75ed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java @@ -1,5 +1,6 @@ package mineplex.core.gadget.gadgets.item; +import java.awt.Color; import java.time.Month; import java.time.YearMonth; import java.util.HashMap; @@ -13,6 +14,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; +import org.bukkit.util.Vector; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -21,7 +23,10 @@ import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilGear; import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilText; +import mineplex.core.common.util.particles.ColoredParticle; +import mineplex.core.common.util.particles.DustSpellColor; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.Ammo; import mineplex.core.gadget.types.ItemGadget; @@ -79,14 +84,19 @@ public class ItemBubbleBlaster extends ItemGadget // TODO COOLDOWN AFTER MAX OF 5 SECONDS HOLDING // TODO LAUNCH MULTIPLE WHILE HOLDING - ArmorStand armorStand = player.getWorld().spawn(player.getLocation(), ArmorStand.class); + ArmorStand armorStand = player.getWorld().spawn(player.getLocation().add(0, 1, 0), ArmorStand.class); armorStand.setItemInHand(new ItemStack(Material.STAINED_GLASS, 1, (byte) UtilMath.random.nextInt(15))); armorStand.setSmall(true); armorStand.setVisible(false); _armorStands.put(armorStand, player); - UtilAction.velocity(armorStand, player.getLocation().getDirection(), 1, false, 0, 0.25, 5, false); + double x = UtilMath.random(0.5, 1) - 1.25, z = UtilMath.random(0.5, 1) - 1.25; + double sub = UtilMath.random(0.5, 1); + if (sub > 0.75) + UtilAction.velocity(armorStand, player.getLocation().getDirection().add(new Vector(x, 0, z)), 0.25, false, 0, 0.5, 1, false); + else + UtilAction.velocity(armorStand, player.getLocation().getDirection().subtract(new Vector(x, 0, z)), 0.25, false, 0, 0.5, 1, false); } @EventHandler @@ -101,9 +111,10 @@ public class ItemBubbleBlaster extends ItemGadget Map.Entry entry = iterator.next(); ArmorStand armorStand = entry.getKey(); Player player = entry.getValue(); - UtilAction.velocity(armorStand, armorStand.getLocation().getDirection(), 1, false, 0, 0.25, 0, false); if (armorStand.getTicksLived() >= 20) { + ColoredParticle coloredParticle = new ColoredParticle(UtilParticle.ParticleType.RED_DUST, new DustSpellColor(Color.WHITE), armorStand.getLocation()); + coloredParticle.display(); armorStand.remove(); iterator.remove(); } From 8bddad44da4741996c6a2209b5ae855c4279946b Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 24 Mar 2017 16:46:14 +0000 Subject: [PATCH 06/91] Bridges hotfix --- .../game/arcade/game/games/bridge/Bridge.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 91bf17b99..718e6e2d2 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 @@ -272,14 +272,14 @@ public class Bridge extends TeamGame implements OreObsfucation }); } - @EventHandler + @EventHandler(priority = EventPriority.LOWEST) public void prepare(GameStateChangeEvent event) { - if (event.GetState() != GameState.Prepare) + if (event.GetState() != GameState.Prepare || !WorldData.GetCustomLocs("DISABLE_BORDER").isEmpty()) { return; } - + //Delay this so that we are 100% sure people are in the world. Manager.runSyncLater(() -> { @@ -387,9 +387,9 @@ public class Bridge extends TeamGame implements OreObsfucation } } } - + _animation.onParse(); - + ParseChests(); ParseOre(WorldData.GetCustomLocs("73")); // Red @@ -1654,10 +1654,10 @@ public class Bridge extends TeamGame implements OreObsfucation } } - @EventHandler(priority=EventPriority.LOWEST) + @EventHandler(priority=EventPriority.HIGHEST) public void revivePlayer(CustomDamageEvent event) { - if (!IsLive() || _bridgesDown || !(event.GetDamageeEntity() instanceof Player)) + if (!IsLive() || event.isCancelled() || _bridgesDown || !(event.GetDamageeEntity() instanceof Player)) { return; } From 5564dc7daf2cf36125eb91967ee5ecf5b16be641 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Mar 2017 13:57:20 +0000 Subject: [PATCH 07/91] Fix even more bugs --- .../game/arcade/game/games/bridge/Bridge.java | 115 ++++++++---------- .../custom/CustomBridgeAnimation.java | 5 + .../game/games/bridge/kits/KitApple.java | 4 +- .../game/games/bridge/kits/KitArcher.java | 4 +- .../game/games/bridge/kits/KitBerserker.java | 2 +- .../game/games/bridge/kits/KitBomber.java | 4 +- .../game/games/bridge/kits/KitBrawler.java | 4 +- .../game/arcade/kit/perks/PerkMammoth.java | 6 +- 8 files changed, 71 insertions(+), 73 deletions(-) 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 718e6e2d2..e360fe12a 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 @@ -30,10 +30,7 @@ import nautilus.game.arcade.kit.perks.PerkDestructor; import nautilus.game.arcade.ore.OreHider; import nautilus.game.arcade.ore.OreObsfucation; import nautilus.game.arcade.stats.*; -import org.bukkit.Effect; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.Material; +import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Chest; @@ -74,11 +71,6 @@ public class Bridge extends TeamGame implements OreObsfucation */ private static final long BRIDGE_TIME = TimeUnit.MINUTES.toMillis(10); - /** - * The number of ticks after the prepare state that we wait before setting the world border for the players. Just to make sure they are in the correct world. - */ - private static final int WORLD_BORDER_PREPARE_TICKS = 20; - private static final String CUSTOM_BRIDGE_KEY = "TYPE"; //Bridge @@ -113,6 +105,8 @@ public class Bridge extends TeamGame implements OreObsfucation private boolean _tournament; private HashMap _tournamentKills = new HashMap(); private long _tournamentKillMessageTimer = 0; + + private final Map _averageSpawns = new HashMap<>(); @SuppressWarnings("unchecked") public Bridge(ArcadeManager manager) @@ -145,7 +139,6 @@ public class Bridge extends TeamGame implements OreObsfucation new KitApple(manager), new KitBerserker(manager), new KitBrawler(manager), - new KitMammoth(manager), new KitArcher(manager), new KitMiner(manager), new KitBomber(manager), @@ -225,25 +218,18 @@ public class Bridge extends TeamGame implements OreObsfucation new CompassModule() .setGiveCompassToAlive(true) .register(this); - - new WorldBorderModule().register(this); - + // So that we can be 110% sure for (Kit kit : GetKits()) { if (kit instanceof KitDestructor) { - for (Perk perk : kit.GetPerks()) - { - ((PerkDestructor) perk).setEnabled(false); - break; - } - + ((KitDestructor) kit).SetEnabled(false); break; } } - registerDebugCommand(new DebugCommand("bridge", Rank.ADMIN) + registerDebugCommand(new DebugCommand("bridge", getArcadeManager().getGameCommandRank()) { @Override @@ -272,40 +258,15 @@ public class Bridge extends TeamGame implements OreObsfucation }); } - @EventHandler(priority = EventPriority.LOWEST) + @EventHandler public void prepare(GameStateChangeEvent event) { - if (event.GetState() != GameState.Prepare || !WorldData.GetCustomLocs("DISABLE_BORDER").isEmpty()) + if (event.GetState() != GameState.Prepare) { return; } - //Delay this so that we are 100% sure people are in the world. - Manager.runSyncLater(() -> { - - WorldBorderModule borderModule = getModule(WorldBorderModule.class); - - // Here we do some calculations for per player world borders - for (GameTeam team : GetTeamList()) - { - // Step 1 - Get the average location of the spawns, we assume this is generally in an OK position. - Location center = UtilAlg.getAverageLocation(team.GetSpawns()); - // Step 1.5 - Move the location back a bit from the centre, this is usually because spawns are on the inside edge of the islands. - center.add(UtilAlg.getTrajectory(SpectatorSpawn, center).multiply(15)); - - // Step 2 - Calculate an estimate for the size of the border. We'll go with half but the setSize uses the radius so it works out the same to leave it like this - double distToCenter = UtilMath.offset2d(SpectatorSpawn, center) * 0.9; - - // Step 3 - Send the setCenter and setSize packets to the team members - for (Player player : team.GetPlayers(true)) - { - borderModule.setCenter(player, center); - borderModule.setSize(player, distToCenter); - } - - } - - }, WORLD_BORDER_PREPARE_TICKS); + Manager.runSyncLater(() -> _animation.onParse(), 10); } @EventHandler(priority = EventPriority.MONITOR) @@ -319,17 +280,13 @@ public class Bridge extends TeamGame implements OreObsfucation if (!WorldData.GetCustomLocs("WATER_DAMAGE").isEmpty()) { WorldWaterDamage = 4; - } - - if (WorldWaterDamage > 0) - { String name = WorldData.MapName; if (name.equals("Volcanic Islands")) { UtilTextMiddle.display(C.cRed + "Warning", "Water is Boiling Hot", 10, 60, 20); } - else if (WorldData.MapName.equals("Icelands")) + else if (name.equals("Icelands")) { UtilTextMiddle.display(C.cRed + "Warning", "Water is Freezing Cold", 10, 60, 20); } @@ -388,8 +345,6 @@ public class Bridge extends TeamGame implements OreObsfucation } } - _animation.onParse(); - ParseChests(); ParseOre(WorldData.GetCustomLocs("73")); // Red @@ -750,12 +705,12 @@ public class Bridge extends TeamGame implements OreObsfucation { _bridgesDown = true; - WorldBorderModule borderModule = getModule(WorldBorderModule.class); - - for (Player player : GetPlayers(true)) - { - borderModule.setSize(player, 10000); - } +// WorldBorderModule borderModule = getModule(WorldBorderModule.class); +// +// for (Player player : GetPlayers(true)) +// { +// borderModule.setSize(player, 10000); +// } Manager.GetExplosion().SetLiquidDamage(true); Announce(C.cRedB + "ALERT: " + C.Reset + C.Bold + "THE BRIDGES ARE SPAWNING!"); @@ -1754,6 +1709,44 @@ public class Bridge extends TeamGame implements OreObsfucation } } + @EventHandler + public void updateBorder(UpdateEvent event) + { + if (event.getType() != UpdateType.FAST || _bridgesDown) + { + return; + } + + for (GameTeam team : GetTeamList()) + { + List border = WorldData.GetCustomLocs("BORDER " + team.getDisplayName()); + + if (border.size() < 2) + { + continue; + } + + Location one = border.get(0); + Location two = border.get(1); + Location average = _averageSpawns.computeIfAbsent(team, k -> UtilAlg.getAverageLocation(team.GetSpawns())); + + one.setY(0); + two.setY(256); + + for (Player player : team.GetPlayers(true)) + { + Location location = player.getLocation(); + + if (!UtilAlg.inBoundingBox(location, one, two)) + { + player.setVelocity(UtilAlg.getTrajectory(location, average).add(new Vector(0, 1, 0))); + player.sendMessage(C.cRedB + "STAY ON YOUR ISLAND!"); + player.playSound(player.getLocation(), Sound.NOTE_PLING, 1, 0.5F); + } + } + } + } + public void setBridgeTime(int time) { _bridgeTime = time; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java index fe5e6ed04..b2d9e5752 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java @@ -179,6 +179,11 @@ public abstract class CustomBridgeAnimation extends BridgeAnimation continue; } + for (Location location : locations) + { + location.getChunk().load(); + } + for (Block block : UtilBlock.getInBoundingBox(locations.get(0), locations.get(1))) { if (!_blockIds.contains(block.getTypeId()) || _bridgeBlocks.containsKey(block)) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java index 021c06e83..06e51b7df 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java @@ -16,12 +16,12 @@ public class KitApple extends ProgressingKit private static final String[] DESCRIPTION = { "Possess the rare skill of finding apples frequently!", "", - receiveItem("apple", 1, 10, 0), + receiveItem("apple", 1, 17, 0), click(true, "the apple to throw it") }; private static final Perk[] PERKS = { - new PerkApple(10000) + new PerkApple(17000) }; private static final ItemStack IN_HAND = new ItemStack(Material.APPLE); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java index 87ee2d8dd..61ded9e2f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java @@ -22,12 +22,12 @@ public class KitArcher extends ProgressingKit "Highly trained with a bow, probably an elf or something...", " ", "Begin the game with a Bow", - receiveArrowString(1, 20, 3), + receiveArrowString(1, 20, 4), "Charge Bow to use " + C.cGreen + "Barrage" }; private static final Perk[] PERKS = { - new PerkFletcher(20, 3, true), + new PerkFletcher(20, 4, true), new PerkBarrage(5, 250, true, false), }; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java index 9204c8d7a..f27afad25 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java @@ -25,7 +25,7 @@ public class KitBerserker extends ProgressingKit }; private static final Perk[] PERKS = { - new PerkLeap("Beserker Leap", 1.2, 1.2, 8000), + new PerkLeap("Beserker Leap", 1.2, 1.2, 14000), new PerkAxeman(), }; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java index ab5687571..998152556 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java @@ -17,12 +17,12 @@ public class KitBomber extends ProgressingKit private static final String[] DESCRIPTION = { "Crazy bomb throwing guy.", " ", - receiveItem("TNT", 1, 30, 2), + receiveItem("TNT", 1, 25, 2), C.cYellow + "Click" + C.cWhite + " to throw TNT" }; private static final Perk[] PERKS = { - new PerkBomber(30, 2, -1) + new PerkBomber(25, 2, -1) }; private static final ItemStack IN_HAND = new ItemStack(Material.TNT); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java index 95ac0ede6..2f8b1f2d3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java @@ -22,12 +22,12 @@ public class KitBrawler extends ProgressingKit "Begin with an Iron Sword", "Take " + C.cGreen + "75%" + C.cWhite + " knockback", "Deal " + C.cGreen + "125%" + C.cWhite + " knockback", - "Take " + C.cGreen + "-1" + C.cWhite + " damage from all attacks" + "Take " + C.cGreen + "-0.5" + C.cWhite + " damage from all attacks" }; private static final Perk[] PERKS = { new PerkMammoth(), - new PerkIronSkin(1) + new PerkIronSkin(0.5) }; private static final ItemStack[] PLAYER_ITEMS = { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMammoth.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMammoth.java index 23134ec56..184a581d0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMammoth.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMammoth.java @@ -14,7 +14,7 @@ public class PerkMammoth extends Perk { super("Mammoth", new String[] { - C.cGray + "Take 75% knockback and deal 125% knockback", + C.cGray + "Take 85% knockback and deal 115% knockback", }); } @@ -30,7 +30,7 @@ public class PerkMammoth extends Perk if (!Kit.HasKit(damager)) return; - event.AddKnockback(GetName(), 1.25d); + event.AddKnockback(GetName(), 1.15d); } @EventHandler(priority = EventPriority.HIGH) @@ -45,6 +45,6 @@ public class PerkMammoth extends Perk if (!Kit.HasKit(damagee)) return; - event.AddKnockback(GetName(), 0.75d); + event.AddKnockback(GetName(), 0.85d); } } From 02a6f34bd3085273766d5e9a6ed40027025a614c Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Mar 2017 16:05:16 +0000 Subject: [PATCH 08/91] Destructor changes --- .../nautilus/game/arcade/game/games/bridge/Bridge.java | 9 +++++++-- .../arcade/game/games/bridge/kits/KitDestructor.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) 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 e360fe12a..2015d2b0e 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 @@ -1712,7 +1712,7 @@ public class Bridge extends TeamGame implements OreObsfucation @EventHandler public void updateBorder(UpdateEvent event) { - if (event.getType() != UpdateType.FAST || _bridgesDown) + if (!IsLive() || event.getType() != UpdateType.FAST || _bridgesDown) { return; } @@ -1735,11 +1735,16 @@ public class Bridge extends TeamGame implements OreObsfucation for (Player player : team.GetPlayers(true)) { + if (player.getGameMode() != GameMode.SURVIVAL) + { + continue; + } + Location location = player.getLocation(); if (!UtilAlg.inBoundingBox(location, one, two)) { - player.setVelocity(UtilAlg.getTrajectory(location, average).add(new Vector(0, 1, 0))); + player.setVelocity(UtilAlg.getTrajectory(location, average).multiply(3).add(new Vector(0, 0.5, 0))); player.sendMessage(C.cRedB + "STAY ON YOUR ISLAND!"); player.playSound(player.getLocation(), Sound.NOTE_PLING, 1, 0.5F); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java index 178ae8ef1..76a45fd2d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java @@ -26,7 +26,7 @@ public class KitDestructor extends ProgressingKit }; private static final Perk[] PERKS = { - new PerkDestructor(40, 2, 400, false) + new PerkDestructor(40, 2, 400, 1.5, false) }; private static final Achievement[] ACHIEVEMENTS = { From 60231c817ffb8e1cb5bf5659c6f7b86981803dc4 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Mar 2017 16:05:58 +0000 Subject: [PATCH 09/91] Missed a class --- .../game/arcade/kit/perks/PerkDestructor.java | 63 +++++-------------- 1 file changed, 17 insertions(+), 46 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java index 8c575627c..df95372dc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java @@ -32,6 +32,7 @@ import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; +import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.entity.ProjectileLaunchEvent; @@ -49,10 +50,12 @@ public class PerkDestructor extends Perk private long _fallTime; + private double _damage; + private HashSet _preparing = new HashSet(); private HashMap _blocks = new HashMap(); - public PerkDestructor(int spawnRate, int max, long fallTime, boolean enabled) + public PerkDestructor(int spawnRate, int max, long fallTime, double damage, boolean enabled) { super("Seismic Charge", new String[] { @@ -64,7 +67,8 @@ public class PerkDestructor extends Perk _spawnRate = spawnRate; _max = max; _fallTime = fallTime; - + _damage = damage; + _enabled = enabled; } @@ -203,7 +207,17 @@ public class PerkDestructor extends Perk if (!proj.hasMetadata("Destructor")) return; - + + for (Player hit : UtilPlayer.getNearby(proj.getLocation(), 3)) + { + if (player.equals(hit)) + { + continue; + } + + Manager.GetDamage().NewDamageEvent(hit, player, proj, EntityDamageEvent.DamageCause.CUSTOM, _damage, true, true, true, proj.getName(), GetName()); + } + for (Block block : UtilBlock.getInRadius(proj.getLocation(), 4).keySet()) { if (block.getType() == Material.AIR || block.getType() == Material.BEDROCK || block.getType() == Material.BARRIER || block.isLiquid()) @@ -226,49 +240,6 @@ public class PerkDestructor extends Perk proj.getWorld().playSound(proj.getLocation(), Sound.EXPLODE, 1f, 0.5f); proj.getWorld().playSound(proj.getLocation(), Sound.FIREWORK_TWINKLE, 2f, 0.5f); } - -// @EventHandler -// public void collide(PlayerTeleportEvent event) -// { -// if (Manager.GetGame() == null || !Manager.GetGame().IsLive()) -// return; -// -// if (event.getCause() != TeleportCause.ENDER_PEARL) -// return; -// -// if (!Manager.IsAlive(event.getPlayer())) -// return; -// -// if (!Kit.HasKit(event.getPlayer())) -// return; -// -// -// -// for (Block block : UtilBlock.getInRadius(event.getTo(), 4).keySet()) -// { -// if (block.getType() == Material.AIR || block.getType() == Material.BEDROCK || block.isLiquid()) -// continue; -// -// //Event -// PerkDestructorBlockEvent blockEvent = new PerkDestructorBlockEvent(event.getPlayer(), block); -// UtilServer.getServer().getPluginManager().callEvent(blockEvent); -// -// if (!blockEvent.isCancelled()) -// { -// _blocks.put(block, System.currentTimeMillis()); -// -// block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, block.getType()); -// } -// } -// -// UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, event.getTo(), 0f, 0f, 0f, 0f, 1, -// ViewDist.MAX, UtilServer.getPlayers()); -// -// event.getTo().getWorld().playSound(event.getTo(), Sound.EXPLODE, 1f, 0.5f); -// event.getTo().getWorld().playSound(event.getTo(), Sound.FIREWORK_TWINKLE, 2f, 0.5f); -// -// event.setCancelled(true); -// } @SuppressWarnings("deprecation") @EventHandler From 9ee6960038129126633aa767acc6c0ff029e0594 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Sun, 26 Mar 2017 01:25:08 -0300 Subject: [PATCH 10/91] Added bee wings --- .../core/common/shape/ShapeWings.java | 18 ++++++ .../mineplex/core/gadget/GadgetManager.java | 6 +- .../gadgets/particle/ParticleWingsBee.java | 61 +++++++++++++++++++ .../core/gadget/types/ParticleGadget.java | 9 ++- .../powerplayclub/PowerPlayClubRewards.java | 1 + 5 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java index 3800260ed..ac437134b 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java @@ -71,6 +71,24 @@ public class ShapeWings extends ShapeGrid implements CosmeticShape "00000$$0000000$$00000" }; + public static final String[] BEE_WING_PATTERN = new String[] + { + "0$$000000000000000$$0", + "$##$0000000000000$##$", + "0$%%$00000000000$%%$0", + "00$##$000000000$##$00", + "00$%%%$0000000$%%%$00", + "000$###$$000$$###$000", + "0000$%%%%$$$%%%%$0000", + "0000$###########$0000", + "00000$%%%%%%%%%$00000", + "00000$#########$00000", + "00000$%%%$$$%%%$00000", + "0000$###$000$###$0000", + "0000$%%$00000$%%$0000", + "00000$$0000000$$00000" + }; + public static final String[] SMALL_BUTTERFLY_WING_PATTERN = new String[] { "0$$00000000$$0", diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java index 55968b074..afedd8807 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java @@ -98,7 +98,6 @@ import mineplex.core.gadget.gadgets.hat.HatItem; import mineplex.core.gadget.gadgets.hat.HatType; import mineplex.core.gadget.gadgets.item.ItemBatGun; import mineplex.core.gadget.gadgets.item.ItemBow; -import mineplex.core.gadget.gadgets.item.ItemBubbleBlaster; import mineplex.core.gadget.gadgets.item.ItemCoal; import mineplex.core.gadget.gadgets.item.ItemCoinBomb; import mineplex.core.gadget.gadgets.item.ItemDuelingSword; @@ -166,6 +165,7 @@ import mineplex.core.gadget.gadgets.particle.ParticleFairy; import mineplex.core.gadget.gadgets.particle.ParticleFireRings; import mineplex.core.gadget.gadgets.particle.ParticleLegend; import mineplex.core.gadget.gadgets.particle.ParticleWingsAngel; +import mineplex.core.gadget.gadgets.particle.ParticleWingsBee; import mineplex.core.gadget.gadgets.particle.ParticleWingsDemons; import mineplex.core.gadget.gadgets.particle.ParticleWingsInfernal; import mineplex.core.gadget.gadgets.particle.ParticleWingsLove; @@ -361,7 +361,8 @@ public class GadgetManager extends MiniPlugin addGadget(new ItemBow(this)); addGadget(new ItemLovePotion(this)); addGadget(new ItemFlowerGift(this)); - addGadget(new ItemBubbleBlaster(this)); + // NEXT MONTH'S PPC + //addGadget(new ItemBubbleBlaster(this)); // Costume addGadget(new OutfitRaveSuitHelmet(this)); @@ -449,6 +450,7 @@ public class GadgetManager extends MiniPlugin addGadget(new ParticleFreedom(this)); addGadget(new ParticleChristmasTree(this)); addGadget(new ParticleWingsLove(this)); + addGadget(new ParticleWingsBee(this)); // Arrow Trails addGadget(new ArrowTrailFrostLord(this)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java new file mode 100644 index 000000000..b7ac89638 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java @@ -0,0 +1,61 @@ +package mineplex.core.gadget.gadgets.particle; + +import java.awt.Color; +import java.time.Month; +import java.time.YearMonth; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.potion.PotionType; +import org.bukkit.util.Vector; + +import mineplex.core.common.shape.ShapeWings; +import mineplex.core.common.util.C; +import mineplex.core.common.util.LineFormat; +import mineplex.core.common.util.UtilParticle; +import mineplex.core.common.util.UtilText; +import mineplex.core.gadget.GadgetManager; +import mineplex.core.gadget.types.ParticleGadget; +import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; + +public class ParticleWingsBee extends ParticleGadget +{ + + private ShapeWings _wings = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, '#', ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); + private ShapeWings _wingsYellow = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, '%', ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); + private ShapeWings _wingsEdge = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, true, ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); + + public ParticleWingsBee(GadgetManager manager) + { + super(manager, "Bee Wings", + UtilText.splitLineToArray(C.cGray + "Placeholder", LineFormat.LORE), + -14, Material.GLASS, (byte) 0, YearMonth.of(2017, Month.APRIL)); + setDisplayItem(ItemStackFactory.Instance.createCustomPotion(PotionType.INSTANT_HEAL)); + } + + @Override + public void playParticle(Player player, UpdateEvent event) + { + Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); + if (_manager.isMoving(player)) + { + if (event.getType() == UpdateType.TICK) + { + _wings.displayColoredParticle(loc, Color.BLACK); + _wingsYellow.displayColoredParticle(loc, Color.YELLOW); + _wingsEdge.displayColoredParticle(loc, Color.BLACK); + } + return; + } + + if (event.getType() == UpdateType.FAST) + { + _wings.displayColored(loc, Color.BLACK); + _wingsYellow.displayColored(loc, Color.YELLOW); + _wingsEdge.displayColored(loc, Color.BLACK); + } + } +} 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 68e60f9b0..254b33003 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,7 @@ package mineplex.core.gadget.types; +import java.time.YearMonth; + import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -28,7 +30,12 @@ public abstract class ParticleGadget extends Gadget public ParticleGadget(GadgetManager manager, String name, String[] desc, int cost, Material mat, byte data, String...altNames) { super(manager, GadgetType.PARTICLE, name, desc, cost, mat, data, 1, altNames); - } + } + + public ParticleGadget(GadgetManager manager, String name, String[] desc, int cost, Material mat, byte data, YearMonth yearMonth, String...altNames) + { + super(manager, GadgetType.PARTICLE, name, desc, cost, mat, data, yearMonth, 1, altNames); + } @Override public void enableCustom(Player player, boolean message) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java index 3d5f61a42..6090185ed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java @@ -36,6 +36,7 @@ public class PowerPlayClubRewards .put(YearMonth.of(2017, Month.JANUARY), new UnknownSalesPackageItem("Over Easy Morph")) .put(YearMonth.of(2017, Month.FEBRUARY), new PetItem(PetType.TRUE_LOVE_PET)) .put(YearMonth.of(2017, Month.MARCH), new UnknownSalesPackageItem("Gold Pot Morph")) + .put(YearMonth.of(2017, Month.APRIL), new UnknownSalesPackageItem("Bee Wings")) .build(); public interface PowerPlayClubItem From 1c1af8b81e4737b607cb024c8f7a5ef06a31feee Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Sun, 26 Mar 2017 08:09:58 -0300 Subject: [PATCH 11/91] Changed shape of bee wings --- .../core/common/shape/ShapeWings.java | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java index ac437134b..58ca18b9b 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java @@ -73,20 +73,23 @@ public class ShapeWings extends ShapeGrid implements CosmeticShape public static final String[] BEE_WING_PATTERN = new String[] { - "0$$000000000000000$$0", - "$##$0000000000000$##$", - "0$%%$00000000000$%%$0", - "00$##$000000000$##$00", - "00$%%%$0000000$%%%$00", - "000$###$$000$$###$000", - "0000$%%%%$$$%%%%$0000", - "0000$###########$0000", - "00000$%%%%%%%%%$00000", - "00000$#########$00000", - "00000$%%%$$$%%%$00000", - "0000$###$000$###$0000", - "0000$%%$00000$%%$0000", - "00000$$0000000$$00000" + "000$$0000000000$$000", + "00$%%$00000000$%%$00", + "0$####$000000$####$0", + "$%%%%%$000000$%%%%%$", + "$#####$000000$#####$", + "$%%%%%%$0000$%%%%%%$", + "$######$0000$######$", + "$%%%%%%$0000$%%%%%%$", + "$######$$$$$$######$", + "$%%%%%%%%%%%%%%%%%%$", + "0$################$0", + "00$%%%%$$$$$$%%%%$00", + "00$####$0000$####$00", + "0$%%%%%$0000$%%%%%$0", + "00$###$000000$###$00", + "000$%%$000000$%%$000", + "0000$$00000000$$0000" }; public static final String[] SMALL_BUTTERFLY_WING_PATTERN = new String[] From 28fa092b20b6c2dee1ad1913cf836d6285c98213 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 26 Mar 2017 13:39:12 +0100 Subject: [PATCH 12/91] Additional kit changes --- .../game/arcade/game/games/bridge/Bridge.java | 4 +-- .../game/games/bridge/kits/KitApple.java | 4 +-- .../game/games/bridge/kits/KitBerserker.java | 2 +- .../game/games/bridge/kits/KitBrawler.java | 8 ++--- .../bridge/modes/kits/KitBrawlAppler.java | 2 +- .../game/arcade/kit/perks/PerkApple.java | 32 +++++++++++++++++-- 6 files changed, 40 insertions(+), 12 deletions(-) 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 2015d2b0e..c3793bb01 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 @@ -185,7 +185,7 @@ public class Bridge extends TeamGame implements OreObsfucation WorldTimeSet = 2000; WorldWaterDamage = 0; - WorldBoundaryKill = false; + WorldBoundaryKill = true; DeathDropItems = true; @@ -1744,7 +1744,7 @@ public class Bridge extends TeamGame implements OreObsfucation if (!UtilAlg.inBoundingBox(location, one, two)) { - player.setVelocity(UtilAlg.getTrajectory(location, average).multiply(3).add(new Vector(0, 0.5, 0))); + player.setVelocity(UtilAlg.getTrajectory(location, average).multiply(2).add(new Vector(0, 0.5, 0))); player.sendMessage(C.cRedB + "STAY ON YOUR ISLAND!"); player.playSound(player.getLocation(), Sound.NOTE_PLING, 1, 0.5F); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java index 06e51b7df..f8ff4b32d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java @@ -16,12 +16,12 @@ public class KitApple extends ProgressingKit private static final String[] DESCRIPTION = { "Possess the rare skill of finding apples frequently!", "", - receiveItem("apple", 1, 17, 0), + receiveItem("apple", 1, 10, 0), click(true, "the apple to throw it") }; private static final Perk[] PERKS = { - new PerkApple(17000) + new PerkApple(10000, 500) }; private static final ItemStack IN_HAND = new ItemStack(Material.APPLE); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java index f27afad25..27d9cc60e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java @@ -25,7 +25,7 @@ public class KitBerserker extends ProgressingKit }; private static final Perk[] PERKS = { - new PerkLeap("Beserker Leap", 1.2, 1.2, 14000), + new PerkLeap("Beserker Leap", 1.2, 1.2, 10000), new PerkAxeman(), }; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java index 2f8b1f2d3..c7100f63b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBrawler.java @@ -20,14 +20,14 @@ public class KitBrawler extends ProgressingKit "Giant and muscular, easily smacks others around.", " ", "Begin with an Iron Sword", - "Take " + C.cGreen + "75%" + C.cWhite + " knockback", - "Deal " + C.cGreen + "125%" + C.cWhite + " knockback", - "Take " + C.cGreen + "-0.5" + C.cWhite + " damage from all attacks" + "Take " + C.cGreen + "85%" + C.cWhite + " knockback", + "Deal " + C.cGreen + "115%" + C.cWhite + " knockback", + "Take " + C.cGreen + "-1" + C.cWhite + " damage from all attacks" }; private static final Perk[] PERKS = { new PerkMammoth(), - new PerkIronSkin(0.5) + new PerkIronSkin(1) }; private static final ItemStack[] PLAYER_ITEMS = { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/kits/KitBrawlAppler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/kits/KitBrawlAppler.java index 88443d4fe..dffa74751 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/kits/KitBrawlAppler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/kits/KitBrawlAppler.java @@ -28,7 +28,7 @@ public class KitBrawlAppler extends ProgressingKit private static final Perk[] PERKS = { - new PerkApple(3000) + new PerkApple(3000, 0) }; private static final ItemStack IN_HAND = new ItemStack(Material.APPLE); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java index 10547e0d8..40fdeae7c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java @@ -21,14 +21,19 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.inventory.ItemStack; + +import java.util.Iterator; public class PerkApple extends Perk implements IThrown { private long _spawnDelay; - - public PerkApple(long delay) + private long _throwDelay; + + public PerkApple(long delay, long throwDelay) { super("Apple Thrower", new String[] { @@ -37,6 +42,7 @@ public class PerkApple extends Perk implements IThrown }); _spawnDelay = delay; + _throwDelay = throwDelay; } @EventHandler @@ -80,6 +86,11 @@ public class PerkApple extends Perk implements IThrown if (!Kit.HasKit(player)) return; + + if (!Recharge.Instance.use(player, getMessage(player) + " Throw", _throwDelay, true, false)) + { + return; + } event.setCancelled(true); @@ -132,6 +143,23 @@ public class PerkApple extends Perk implements IThrown } + @EventHandler + public void playerDeath(PlayerDeathEvent event) + { + if (!hasPerk(event.getEntity())) + { + return; + } + + for (ItemStack itemStack : event.getDrops()) + { + if (itemStack.getType() == Material.APPLE) + { + itemStack.setAmount((int) Math.ceil((double) itemStack.getAmount() / 2D)); + } + } + } + private Material getMaterial(Player player) { if (Manager.getCosmeticManager().getGadgetManager().isKitModifierActive(KitModifier.Bridges_Apple_Potato, player)) From 421d76b7f315551ae1a0121be4eba242d2eae11b Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 27 Mar 2017 19:08:31 +0100 Subject: [PATCH 13/91] More changes! --- .../game/arcade/game/games/bridge/Bridge.java | 12 +++++++++++ .../custom/RadiusCustomBridgeAnimation.java | 2 +- .../game/games/bridge/kits/KitApple.java | 2 +- .../game/games/bridge/kits/KitDestructor.java | 2 +- .../game/arcade/kit/perks/PerkApple.java | 2 +- .../game/arcade/kit/perks/PerkBomber.java | 21 +++++++++++++++++-- 6 files changed, 35 insertions(+), 6 deletions(-) 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 c3793bb01..d26106512 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 @@ -26,6 +26,7 @@ import nautilus.game.arcade.game.modules.WorldBorderModule; import nautilus.game.arcade.game.modules.compass.CompassModule; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Perk; +import nautilus.game.arcade.kit.perks.PerkBomber; import nautilus.game.arcade.kit.perks.PerkDestructor; import nautilus.game.arcade.ore.OreHider; import nautilus.game.arcade.ore.OreObsfucation; @@ -1076,6 +1077,16 @@ public class Bridge extends TeamGame implements OreObsfucation } } + @EventHandler + public void diamondOreExplode(PerkBomber.BomberExplodeDiamondBlock event) + { + event.setSpawnDrop(false); + event.getBlock().setType(Material.AIR); + + Item item = event.getBlock().getWorld().dropItem(event.getBlock().getLocation().add(.5, .5, .5), new ItemStack(Material.DIAMOND_ORE)); + item.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), event.getPlayer().getUniqueId())); + } + @EventHandler public void itemPickup(PlayerPickupItemEvent event) { @@ -1630,6 +1641,7 @@ public class Bridge extends TeamGame implements OreObsfucation UtilPlayer.message(player, F.main("Game", "You used your " + F.elem(C.cAqua + "Early Game Revive") + ".")); + player.setFallDistance(0); GetTeam(player).SpawnTeleport(player); player.setHealth(20); event.SetCancelled("Early Game Revive"); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java index fe0779c7c..18ddcbece 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java @@ -29,7 +29,7 @@ public class RadiusCustomBridgeAnimation extends CustomBridgeAnimation @Override public void onUpdate(UpdateType type) { - if (type != UpdateType.FAST) + if (type != UpdateType.SEC) { return; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java index f8ff4b32d..f1127ed69 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java @@ -21,7 +21,7 @@ public class KitApple extends ProgressingKit }; private static final Perk[] PERKS = { - new PerkApple(10000, 500) + new PerkApple(10000, 250) }; private static final ItemStack IN_HAND = new ItemStack(Material.APPLE); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java index 76a45fd2d..6d342c592 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java @@ -26,7 +26,7 @@ public class KitDestructor extends ProgressingKit }; private static final Perk[] PERKS = { - new PerkDestructor(40, 2, 400, 1.5, false) + new PerkDestructor(40, 2, 400, 3, false) }; private static final Achievement[] ACHIEVEMENTS = { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java index 40fdeae7c..eba99996d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java @@ -87,7 +87,7 @@ public class PerkApple extends Perk implements IThrown if (!Kit.HasKit(player)) return; - if (!Recharge.Instance.use(player, getMessage(player) + " Throw", _throwDelay, true, false)) + if (!Recharge.Instance.use(player, getMessage(player) + " Throw", _throwDelay, false, false)) { return; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBomber.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBomber.java index 98bb50f9d..5685169dc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBomber.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkBomber.java @@ -39,18 +39,30 @@ public class PerkBomber extends Perk } private final Block _block; + private boolean _spawnDrop; public BomberExplodeDiamondBlock(Player who, Block block) { super(who); _block = block; + _spawnDrop = true; } public Block getBlock() { return _block; } + + public void setSpawnDrop(boolean b) + { + _spawnDrop = b; + } + + public boolean shouldSpawnDrop() + { + return _spawnDrop; + } } private static final String THROWING_TNT_DISPLAY_NAME = F.item("Throwing TNT"); @@ -265,8 +277,13 @@ public class PerkBomber extends Perk if (block.getType() == Material.DIAMOND_ORE) { - Bukkit.getPluginManager().callEvent(new BomberExplodeDiamondBlock(player, block)); - block.breakNaturally(); + BomberExplodeDiamondBlock explodeEvent = new BomberExplodeDiamondBlock(player, block); + UtilServer.CallEvent(explodeEvent); + + if (explodeEvent.shouldSpawnDrop()) + { + block.breakNaturally(); + } it.remove(); } } From e0819bfd7d497026c07e5289d770a2e56e655be0 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 27 Mar 2017 19:14:07 +0100 Subject: [PATCH 14/91] Make appler ignore damage rate --- .../src/nautilus/game/arcade/kit/perks/PerkApple.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java index eba99996d..9df6c4b31 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java @@ -118,7 +118,7 @@ public class PerkApple extends Perk implements IThrown //Damage Event Manager.GetDamage().NewDamageEvent(target, data.getThrower(), null, - DamageCause.CUSTOM, 3, true, false, false, + DamageCause.CUSTOM, 3, true, true, false, UtilEnt.getName(data.getThrower()), GetName()); //Effect From fff18ef2a0139f57b9b4e7efbe7849bb26620777 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 27 Mar 2017 19:19:45 +0100 Subject: [PATCH 15/91] Revert "Make appler ignore damage rate" This reverts commit e0819bfd7d497026c07e5289d770a2e56e655be0. --- .../src/nautilus/game/arcade/kit/perks/PerkApple.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java index 9df6c4b31..eba99996d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkApple.java @@ -118,7 +118,7 @@ public class PerkApple extends Perk implements IThrown //Damage Event Manager.GetDamage().NewDamageEvent(target, data.getThrower(), null, - DamageCause.CUSTOM, 3, true, true, false, + DamageCause.CUSTOM, 3, true, false, false, UtilEnt.getName(data.getThrower()), GetName()); //Effect From 235288af56feddb1c1f28e38d8f8c0294cf4c006 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Mon, 27 Mar 2017 17:35:05 -0300 Subject: [PATCH 16/91] Changed wing shape again --- .../core/common/shape/ShapeWings.java | 30 ++++++++----------- .../gadgets/particle/ParticleWingsBee.java | 17 +++++------ 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java index 58ca18b9b..5e6621476 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/shape/ShapeWings.java @@ -73,23 +73,19 @@ public class ShapeWings extends ShapeGrid implements CosmeticShape public static final String[] BEE_WING_PATTERN = new String[] { - "000$$0000000000$$000", - "00$%%$00000000$%%$00", - "0$####$000000$####$0", - "$%%%%%$000000$%%%%%$", - "$#####$000000$#####$", - "$%%%%%%$0000$%%%%%%$", - "$######$0000$######$", - "$%%%%%%$0000$%%%%%%$", - "$######$$$$$$######$", - "$%%%%%%%%%%%%%%%%%%$", - "0$################$0", - "00$%%%%$$$$$$%%%%$00", - "00$####$0000$####$00", - "0$%%%%%$0000$%%%%%$0", - "00$###$000000$###$00", - "000$%%$000000$%%$000", - "0000$$00000000$$0000" + "00$$$000$$$00", + "0$###$0$###$0", + "$$$$$$$$$$$$$", + "$#####$#####$", + "$$$$$$$$$$$$$", + "0$#########$0", + "00$$$$$$$$$00", + "0$#########$0", + "$$$$$$$$$$$$$", + "$#####$#####$", + "$$$$$$$$$$$$$", + "0$###$0$###$0", + "00$$$000$$$00" }; public static final String[] SMALL_BUTTERFLY_WING_PATTERN = new String[] diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java index b7ac89638..dbda72fa8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java @@ -24,15 +24,14 @@ import mineplex.core.updater.event.UpdateEvent; public class ParticleWingsBee extends ParticleGadget { - private ShapeWings _wings = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, '#', ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); - private ShapeWings _wingsYellow = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, '%', ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); - private ShapeWings _wingsEdge = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, true, ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); + private ShapeWings _wingsBlack = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, '$', ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); + private ShapeWings _wingsYellow = new ShapeWings(UtilParticle.ParticleType.RED_DUST.particleName, new Vector(1, 1, 1), 1, 0, '#', ShapeWings.DEFAULT_ROTATION, ShapeWings.BEE_WING_PATTERN); public ParticleWingsBee(GadgetManager manager) { - super(manager, "Bee Wings", - UtilText.splitLineToArray(C.cGray + "Placeholder", LineFormat.LORE), - -14, Material.GLASS, (byte) 0, YearMonth.of(2017, Month.APRIL)); + super(manager, "Bumblebee's Wings", + UtilText.splitLineToArray(C.cGray + "Float like a butterfly and sting like a bee with these new spring wings!", LineFormat.LORE), + -14, Material.WOOL, (byte) 4, YearMonth.of(2017, Month.APRIL)); setDisplayItem(ItemStackFactory.Instance.createCustomPotion(PotionType.INSTANT_HEAL)); } @@ -44,18 +43,16 @@ public class ParticleWingsBee extends ParticleGadget { if (event.getType() == UpdateType.TICK) { - _wings.displayColoredParticle(loc, Color.BLACK); + _wingsBlack.displayColoredParticle(loc, Color.BLACK); _wingsYellow.displayColoredParticle(loc, Color.YELLOW); - _wingsEdge.displayColoredParticle(loc, Color.BLACK); } return; } if (event.getType() == UpdateType.FAST) { - _wings.displayColored(loc, Color.BLACK); + _wingsBlack.displayColored(loc, Color.BLACK); _wingsYellow.displayColored(loc, Color.YELLOW); - _wingsEdge.displayColored(loc, Color.BLACK); } } } From 4f0110b94225c18dcd5c909994b8e6d8ae4017c0 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Mon, 27 Mar 2017 20:19:54 -0300 Subject: [PATCH 17/91] Updated offset of the wings --- .../core/gadget/gadgets/particle/ParticleWingsBee.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java index dbda72fa8..7d25d438e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java @@ -7,7 +7,6 @@ import java.time.YearMonth; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; -import org.bukkit.potion.PotionType; import org.bukkit.util.Vector; import mineplex.core.common.shape.ShapeWings; @@ -17,7 +16,6 @@ import mineplex.core.common.util.UtilParticle; import mineplex.core.common.util.UtilText; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.types.ParticleGadget; -import mineplex.core.itemstack.ItemStackFactory; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -32,13 +30,12 @@ public class ParticleWingsBee extends ParticleGadget super(manager, "Bumblebee's Wings", UtilText.splitLineToArray(C.cGray + "Float like a butterfly and sting like a bee with these new spring wings!", LineFormat.LORE), -14, Material.WOOL, (byte) 4, YearMonth.of(2017, Month.APRIL)); - setDisplayItem(ItemStackFactory.Instance.createCustomPotion(PotionType.INSTANT_HEAL)); } @Override public void playParticle(Player player, UpdateEvent event) { - Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); + Location loc = player.getLocation().add(0, 1, 0).add(player.getLocation().getDirection().multiply(-0.4)); if (_manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) From cb5a63974eaed18cd4e879ab8acde549bf09d900 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Mon, 27 Mar 2017 20:21:46 -0300 Subject: [PATCH 18/91] Changed name of the item in PPC rewards --- .../src/mineplex/core/powerplayclub/PowerPlayClubRewards.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java index 6090185ed..60f365341 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java @@ -36,7 +36,7 @@ public class PowerPlayClubRewards .put(YearMonth.of(2017, Month.JANUARY), new UnknownSalesPackageItem("Over Easy Morph")) .put(YearMonth.of(2017, Month.FEBRUARY), new PetItem(PetType.TRUE_LOVE_PET)) .put(YearMonth.of(2017, Month.MARCH), new UnknownSalesPackageItem("Gold Pot Morph")) - .put(YearMonth.of(2017, Month.APRIL), new UnknownSalesPackageItem("Bee Wings")) + .put(YearMonth.of(2017, Month.APRIL), new UnknownSalesPackageItem("Bumblebee's Wings")) .build(); public interface PowerPlayClubItem From 4f3cfaba43d9739ee3c532c6647c404014930626 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:08:56 -0500 Subject: [PATCH 19/91] PC-163 PC-200 Reset a player's spectator target when they switch servers --- Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java index 5d0d5eb88..68a0c10c1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java @@ -10,6 +10,7 @@ import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.GameMode; import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -195,6 +196,11 @@ public class Portal extends MiniPlugin */ public void sendPlayer(final Player player, String serverName) { + if (player.getGameMode() == GameMode.SPECTATOR) + { + player.setSpectatorTarget(null); + } + ByteArrayOutputStream b = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(b); From 953a87b3ea4ab05cc3d3f3dd98e07ae6efbba2cf Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:13:48 -0500 Subject: [PATCH 20/91] PC-207 --- .../Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java index f4ccf801a..33c41236a 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java @@ -115,7 +115,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "", C.Reset + "One team must steal the other", C.Reset + "team's flag. Capture it", - C.Reset + "three times to win.", + C.Reset + "five times to win.", }, new String[] {"CTF"}, "CTF", new SelectCTFButton(this)); add(20, Material.BEACON, C.cYellowB + "Dominate " + C.cGray + "Team Game", new String[] From 26d3a777486473849ebb98644f2e496fceb38150 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:21:00 -0500 Subject: [PATCH 21/91] PC-368 --- .../Mineplex.Core/src/mineplex/core/mount/DragonData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java index a1d664e60..3cc8682a9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java @@ -11,6 +11,8 @@ import org.bukkit.entity.Chicken; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; import mineplex.core.common.util.UtilAlg; @@ -29,7 +31,7 @@ public class DragonData extends MountData public float Pitch = 0; public Vector Velocity = new Vector(0,0,0); - public Entity Chicken; + public Chicken Chicken; public DragonData(DragonMount dragonMount, Player rider) { @@ -50,6 +52,7 @@ public class DragonData extends MountData rider.getWorld().playSound(rider.getLocation(), Sound.ENDERDRAGON_GROWL, 20f, 1f); Chicken = rider.getWorld().spawn(rider.getLocation(), Chicken.class); + Chicken.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 99999999, 1)); Dragon.setPassenger(Chicken); Chicken.setPassenger(getOwner()); From 1ecd46f7eea1f3b8a82fe14ab77e8d7caffb7d2f Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 22:35:13 -0500 Subject: [PATCH 22/91] PC-372 --- .../game/arcade/managers/GameHostManager.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index 49e45ee5e..c7bfd17eb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -561,16 +561,23 @@ public class GameHostManager implements Listener @EventHandler public void whitelistCommand(PlayerCommandPreprocessEvent event) { - if (_host == null || !event.getPlayer().equals(_host)) + if (_host == null) return; - if (isCommunityServer()) - return; - + if (!event.getMessage().toLowerCase().startsWith("/whitelist")) return; - if (!isPrivateServer()) + if (!event.getPlayer().equals(_host)) + { + event.setCancelled(true); + UtilPlayer.message(event.getPlayer(), F.main("MPS", "You do not have permission to whitelist players. Ask the MPS host")); return; + } + if (isCommunityServer() || !isPrivateServer()) + { + event.setCancelled(true); + return; + } event.setCancelled(true); From 9256fe990344b539c790e3bf0e617a817a6d2cbf Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:22:17 -0500 Subject: [PATCH 23/91] PC-401 --- .../src/mineplex/core/achievement/AchievementCategory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java index 511e97086..22cfcc59d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java @@ -112,7 +112,7 @@ public enum AchievementCategory DRAW_MY_THING("Draw My Thing", null, new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED }, - Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, "Extra Tools Kit", false, GameDisplay.Draw.getGameId()), + Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, "None", false, GameDisplay.Draw.getGameId()), CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM", "Champions CTF"}, new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED, new StatDisplay("Flags Captured", "Captures") }, From 66e3a7ad5c2453af537bf6d480d031e7524e644b Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 22:11:02 -0500 Subject: [PATCH 24/91] PC-587 --- .../nautilus/game/arcade/game/games/smash/SoloSuperSmash.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java index 1cb424597..e542c7549 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SoloSuperSmash.java @@ -65,7 +65,7 @@ public class SoloSuperSmash extends SuperSmash { super(manager, kits, type, new String[] { - "Each player has 3 respawns", + "Each player has 4 respawns", "Attack to restore hunger!", "Last player alive wins!" }); From 99534e19c550e00d6cab1c4e6a1d88eecbbe6064 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:31:03 -0500 Subject: [PATCH 25/91] PC-599 --- .../mineplex/core/common/util/UtilEnt.java | 41 +++++-------------- .../mineplex/core/mount/types/MountSlime.java | 2 + 2 files changed, 13 insertions(+), 30 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java index 062823754..ccd084a5e 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java @@ -312,38 +312,19 @@ public class UtilEnt public static void removeGoalSelectors(Entity entity) { - try + if (((CraftEntity)entity).getHandle() instanceof EntityInsentient) { - if (_goalSelector == null) - { - _goalSelector = EntityInsentient.class.getDeclaredField("goalSelector"); - _goalSelector.setAccessible(true); - } - - if (((CraftEntity)entity).getHandle() instanceof EntityInsentient) - { - EntityInsentient creature = (EntityInsentient)((CraftEntity)entity).getHandle(); - - PathfinderGoalSelector goalSelector = new PathfinderGoalSelector(((CraftWorld)entity.getWorld()).getHandle().methodProfiler); - - _goalSelector.set(creature, goalSelector); - } - } - catch (IllegalArgumentException e) + EntityInsentient creature = (EntityInsentient)((CraftEntity)entity).getHandle(); + creature.goalSelector = new PathfinderGoalSelector(((CraftWorld)entity.getWorld()).getHandle().methodProfiler); + } + } + + public static void removeTargetSelectors(Entity entity) + { + if (((CraftEntity)entity).getHandle() instanceof EntityInsentient) { - e.printStackTrace(); - } - catch (IllegalAccessException e) - { - e.printStackTrace(); - } - catch (NoSuchFieldException e) - { - e.printStackTrace(); - } - catch (SecurityException e) - { - e.printStackTrace(); + EntityInsentient creature = (EntityInsentient)((CraftEntity)entity).getHandle(); + creature.targetSelector = new PathfinderGoalSelector(((CraftWorld)entity.getWorld()).getHandle().methodProfiler); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java index 265601406..9d916335c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java @@ -50,6 +50,8 @@ public class MountSlime extends Mount> mount.getEntity().setCustomName(player.getName() + "'s " + getName()); + UtilEnt.removeTargetSelectors(mount.getEntity()); + //Inform UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(getName()) + ".")); From e45e27ba340e3de5246a63e3a0433715302aebea Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:38:29 -0500 Subject: [PATCH 26/91] PC-629 --- .../game/games/gladiators/hotbar/HotbarEditor.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java index 88b9411c9..364028b29 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/hotbar/HotbarEditor.java @@ -14,6 +14,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.inventory.Inventory; @@ -127,11 +128,24 @@ public class HotbarEditor extends MiniPlugin if (UtilItem.isSimilar(item, _item, UtilItem.ItemAttribute.NAME)) { + event.setCancelled(true); HotbarInventory.open(event.getPlayer(), this); } } } + @EventHandler + public void onInteract(PlayerInteractEntityEvent event) + { + ItemStack item = event.getPlayer().getItemInHand(); + + if (UtilItem.isSimilar(item, _item, UtilItem.ItemAttribute.NAME)) + { + event.setCancelled(true); + HotbarInventory.open(event.getPlayer(), this); + } + } + public Gladiators getHost() { return _host; From 3b8bda9dbd7448bbb468bf0d14843ddcef1714e2 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:52:58 -0500 Subject: [PATCH 27/91] PC-728 --- Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java index 71f36d24d..fc0a27fb4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java @@ -369,7 +369,7 @@ public class Chat extends MiniPlugin msgContainsHack(event.getMessage())) { UtilPlayer.message(sender, F.main("Chat", - "Accusing players of cheating in-game is against the rules." + "Accusing players of cheating in-game is against the rules. " + "If you think someone is cheating, please gather evidence and report it at " + F.link("www.mineplex.com/reports"))); event.setCancelled(true); From 23c52eed2c9e648f8041be4690680bc43ffdc166 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:55:31 -0500 Subject: [PATCH 28/91] PC-729 --- .../src/mineplex/core/chat/command/BroadcastCommand.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/command/BroadcastCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/command/BroadcastCommand.java index 5f2cdd1c2..ed97355c8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chat/command/BroadcastCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/command/BroadcastCommand.java @@ -5,6 +5,8 @@ import org.bukkit.entity.Player; import mineplex.core.chat.Chat; import mineplex.core.command.CommandBase; import mineplex.core.common.Rank; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; public class BroadcastCommand extends CommandBase @@ -17,6 +19,12 @@ public class BroadcastCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { + if (args.length == 0) + { + UtilPlayer.message(caller, F.main("Broadcast", "What are you broadcasting?")); + return; + } + String announcement = ""; for (String arg : args) From 4ad5cede14f044f4fba67f6d25d82dc76eb44b8f Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:56:07 -0500 Subject: [PATCH 29/91] PC-740 --- .../minecraft/game/classcombat/Skill/Ranger/RopedArrow.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/RopedArrow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/RopedArrow.java index 8b6f4e2bc..a15cdc08a 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/RopedArrow.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/RopedArrow.java @@ -49,7 +49,7 @@ public class RopedArrow extends SkillActive { "Prepare a roped arrow;", "Your next arrow will pull you", - "pull you in after it hits.", + "in after it hits.", }); } From c95fea066c60d75fef3fa8086df1637c5d95e9ee Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 01:01:44 -0500 Subject: [PATCH 30/91] PC-778 --- .../game/classcombat/Skill/Mage/Inferno.java | 2 +- .../games/gladiators/modes/ChampionsGladiators.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java index 2c07078cb..0745f87ee 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Inferno.java @@ -69,7 +69,7 @@ public class Inferno extends SkillActive } @Override - public void Skill(Player player, int level) + public void Skill(Player player, int level) { _active.add(player); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/modes/ChampionsGladiators.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/modes/ChampionsGladiators.java index dd740ef73..d7af66dea 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/modes/ChampionsGladiators.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/modes/ChampionsGladiators.java @@ -5,6 +5,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityRegainHealthEvent; +import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent; + import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; @@ -17,6 +19,7 @@ import nautilus.game.arcade.game.games.champions.kits.KitRanger; import nautilus.game.arcade.game.games.gladiators.Arena; import nautilus.game.arcade.game.games.gladiators.ArenaType; import nautilus.game.arcade.game.games.gladiators.Gladiators; +import nautilus.game.arcade.game.games.gladiators.RoundState; import nautilus.game.arcade.kit.Kit; /** @@ -88,5 +91,11 @@ public class ChampionsGladiators extends Gladiators { return "Champions Gladiators"; } - + + @EventHandler + public void skill(SkillTriggerEvent event) + { + if (getRoundState() != RoundState.FIGHTING) + event.SetCancelled(true); + } } From 8521691cfb5988d2271b41352b4494c49c1ca5db Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 20:05:48 -0500 Subject: [PATCH 31/91] PC-817 --- .../game/arcade/game/games/minestrike/items/guns/Gun.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java index cc694d4f9..34de2ce93 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java @@ -559,7 +559,7 @@ public class Gun extends StrikeItem C.cYellow + C.Bold + "Damage per Bullet: " + ChatColor.RESET + UtilMath.trim(1, getDamage()), C.cYellow + C.Bold + "Armor Penetration: " + ChatColor.RESET + (int)(_gunStats.getArmorPen()*100) + "%", C.cYellow + C.Bold + "Damage Dropoff: " + ChatColor.RESET + (int)(_gunStats.getDropoff()*1000d) + "% per 10 Blocks", - C.cYellow + C.Bold + "Recoil per Shot: " + ChatColor.RESET + _gunStats.getConeIncreaseRate(), + C.cYellow + C.Bold + "Recoil per Shot: " + ChatColor.RESET + UtilMath.trim(2, _gunStats.getConeIncreaseRate()), C.cYellow + C.Bold + "Recoil Recovery: " + ChatColor.RESET + _gunStats.getConeReduceRate() + " per Second", }; } From 858b08e3c35bfc86a61429ae595ec6e22dd98611 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 21:58:16 -0500 Subject: [PATCH 32/91] PC-825 --- .../gui/privateServer/page/SetGamePage.java | 23 +++++++++++++------ .../game/arcade/managers/GameHostManager.java | 2 +- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java index ef38a29ed..4a24f5090 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java @@ -1,6 +1,7 @@ package nautilus.game.arcade.gui.privateServer.page; import java.util.ArrayList; +import java.util.List; import mineplex.core.common.util.C; import mineplex.core.game.GameCategory; @@ -89,16 +90,24 @@ public class SetGamePage extends BasePage private void addGameButton(int slot, final GameType type) { - String infoString = ChatColor.RESET + C.cGray + "Make this next Game Type"; - String space = "§1"; - String left = ChatColor.YELLOW + "Left-Click " + C.cGray + "for a §fRandom Map§7."; - String right = ChatColor.YELLOW + "Right-Click " + C.cGray + "to §fChoose Map§7."; - String[] normLore = new String[]{infoString, space, left, right}; + List lore = new ArrayList<>(); + lore.add(ChatColor.RESET + C.cGray + "Make this next Game Type"); + lore.add("§1"); + if (type == GameType.UHC || type == GameType.UHCSolo || type == GameType.UHCSoloSpeed || type == GameType.UHCTeamsSpeed) + { + lore.add(ChatColor.YELLOW + "Left-Click " + C.cGray + "to select"); + } + else + { + lore.add(ChatColor.YELLOW + "Left-Click " + C.cGray + "for a §fRandom Map§7."); + lore.add(ChatColor.YELLOW + "Right-Click " + C.cGray + "to §fChoose Map§7."); + } if (_manager.hasWarning().contains(type)) { - normLore = new String[]{infoString, space, left, right, "§2", "§c§lWARNING: §fThis game was rejected!"}; + lore.add("§2"); + lore.add("§c§lWARNING: §fThis game was rejected!"); } - ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), normLore, 1, false, false); + ShopItem shopItem = new ShopItem(type.GetMaterial(), type.GetMaterialData(), type.GetName(), lore.toArray(new String[lore.size()]), 1, false, false); addButton(slot, shopItem, new IButton() { @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index c7bfd17eb..47ea01a43 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -117,7 +117,7 @@ public class GameHostManager implements Listener legendGames.add(GameType.WitherAssault); legendGames.add(GameType.Wizards); legendGames.add(GameType.Build); - //legendGames.add(GameType.UHC); + legendGames.add(GameType.UHC); legendGames.add(GameType.MineStrike); legendGames.add(GameType.Skywars); legendGames.add(GameType.SpeedBuilders); From 8a78f1ce340f9368423cec02c92396571c05b0a0 Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 15:11:29 -0500 Subject: [PATCH 33/91] PC-1026 --- .../nautilus/game/arcade/game/games/turfforts/TurfForts.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index e9b881916..746716226 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -380,7 +380,7 @@ public class TurfForts extends TeamGame while (block.getTypeId() == 0 && block.getY() > 0) block = block.getRelative(BlockFace.DOWN); - if (block.getData() != team.GetColorData()) + if (block.getType() != Material.STAINED_CLAY || block.getData() != team.GetColorData()) { UtilPlayer.message(event.getPlayer(), F.main("Game", "You can only build above " + F.elem(team.GetColor() + team.GetName()) + ".")); event.setCancelled(true); From 8226592caa465b0e05818ad45f429dccdc5d3d82 Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 15:21:26 -0500 Subject: [PATCH 34/91] PC-1026 --- .../nautilus/game/arcade/game/games/turfforts/TurfForts.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index 746716226..93c2fb37c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -380,7 +380,7 @@ public class TurfForts extends TeamGame while (block.getTypeId() == 0 && block.getY() > 0) block = block.getRelative(BlockFace.DOWN); - if (block.getType() != Material.STAINED_CLAY || block.getData() != team.GetColorData()) + if ((block.getType() != Material.STAINED_CLAY && block.getType() != Material.WOOL) || block.getData() != team.GetColorData()) { UtilPlayer.message(event.getPlayer(), F.main("Game", "You can only build above " + F.elem(team.GetColor() + team.GetName()) + ".")); event.setCancelled(true); From 3ef8c6f5327a4f4defcc7a0039c617a346c31d6d Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 22:16:51 -0500 Subject: [PATCH 35/91] PC-1101 --- .../game/arcade/game/games/survivalgames/SurvivalGames.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java index d1a7665ad..4dc2f850f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java @@ -1986,7 +1986,7 @@ public abstract class SurvivalGames extends Game @EventHandler public void craftedItems(CraftItemEvent event) { - if (UtilItem.isWeapon(event.getCurrentItem()) || UtilItem.isArmor(event.getCurrentItem())) + if (UtilItem.isWeapon(event.getCurrentItem()) || UtilItem.isArmor(event.getCurrentItem()) || event.getCurrentItem().getType() == Material.FISHING_ROD) { UtilItem.makeUnbreakable(event.getCurrentItem()); } From ca452463db02fdd30265bc5240285ceafd901ee2 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 20:08:19 -0500 Subject: [PATCH 36/91] PC-1106 --- .../src/nautilus/game/arcade/game/games/draw/Draw.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 483fdf15e..457fcb5ce 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 @@ -224,8 +224,8 @@ public class Draw extends SoloGame ); registerChatStats( - new ChatStatData("TotalGuess", "Total Guess'", true), - new ChatStatData("PureLuck", "Lucky Guess'", true) + new ChatStatData("TotalGuess", "Total Guesses", true), + new ChatStatData("PureLuck", "Lucky Guesses", true) ); new CompassModule() From 40648cf715916adb9a1f35f574de46dd04f78e9b Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 20:12:22 -0500 Subject: [PATCH 37/91] PC-1178 --- .../src/mineplex/core/chat/Chat.java | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java index fc0a27fb4..63087f2f9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java @@ -205,22 +205,6 @@ public class Chat extends MiniPlugin return true; } - @EventHandler - public void removeChat(AsyncPlayerChatEvent event) - { - if (event.isCancelled()) - return; - - if (event.isAsynchronous()) - { - for (Iterator playerIterator = event.getRecipients().iterator(); playerIterator.hasNext();) - { - if (!_preferences.get(playerIterator.next()).isActive(Preference.SHOW_CHAT)) - playerIterator.remove(); - } - } - } - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onSignChange(SignChangeEvent event) { @@ -403,6 +387,11 @@ public class Chat extends MiniPlugin return; } } + + if (event.isAsynchronous()) + { + event.getRecipients().removeIf(player -> !_preferences.get(player).isActive(Preference.SHOW_CHAT)); + } } private boolean msgContainsHack(String msg) From fc686ea49744912d0a8014c48d5421bde7e021b0 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 20:15:11 -0500 Subject: [PATCH 38/91] PC-1182 --- .../src/mineplex/core/treasure/TreasureLocation.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java index e0e9f13ce..264da1eae 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java @@ -320,7 +320,7 @@ public class TreasureLocation implements Listener Location centerLocation = treasure.getCenterBlock().getLocation().add(0.5, 0.5, 0.5); if (event.getTo().distanceSquared(centerLocation) > 9) { - Location newTo = event.getFrom(); + Location newTo = centerLocation.clone(); newTo.setPitch(event.getTo().getPitch()); newTo.setYaw(event.getTo().getYaw()); event.setTo(newTo); @@ -340,8 +340,13 @@ public class TreasureLocation implements Listener double fromDistanceFromCenter = centerLocation.distanceSquared(fromLocation); if (toDistanceFromCenter < fromDistanceFromCenter) { - Location spawnLocation = new Location(player.getWorld(), 0, 64, 0); - UtilAction.velocity(player, UtilAlg.getTrajectory(player.getLocation(), spawnLocation).multiply(-1), 1.5, true, 0.8, 0, 1.0, true); + Entity target = player; + while (target.getVehicle() != null) + { + target = target.getVehicle(); + } + Location spawnLocation = new Location(target.getWorld(), 0, 64, 0); + UtilAction.velocity(target, UtilAlg.getTrajectory(target.getLocation(), spawnLocation).multiply(-1), 1.5, true, 0.8, 0, 1.0, true); } } } From cb33bc7bed179e80fcb01c47ba5e4c79d530e8d7 Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 15:56:58 -0500 Subject: [PATCH 39/91] PC-1187 --- .../src/mineplex/core/gadget/gadgets/morph/MorphSquid.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java index 096f453fd..a78f515f9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java @@ -63,6 +63,12 @@ public class MorphSquid extends MorphGadget implements IThrown { removeArmor(player); UtilMorph.undisguise(player, Manager.getDisguiseManager()); + + if (player.getInventory().getBoots() != null && player.getInventory().getBoots().getType() == Material.DIAMOND_BOOTS) + { + player.getInventory().setBoots(new ItemStack(Material.AIR)); + player.removePotionEffect(PotionEffectType.SPEED); + } } @EventHandler From 63eed1abcd0d455bd431b2fa8cce08a0869dd37f Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 16:19:08 -0500 Subject: [PATCH 40/91] PC-1210 --- .../src/mineplex/core/gadget/types/MorphGadget.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java index ff08e8152..4fb2b5ed9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java @@ -26,6 +26,7 @@ public abstract class MorphGadget extends Gadget public void applyArmor(Player player, boolean message) { Manager.removeGadgetType(player, GadgetType.MORPH, this); + Manager.removeGadgetType(player, GadgetType.COSTUME); _active.add(player); From 53d9a5f977a8dc897a34b9cb4f40c144e8d83478 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 22:45:24 -0500 Subject: [PATCH 41/91] PC-1222 --- .../game/arcade/game/games/micro/Micro.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 09941ea19..6e70e0851 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,6 +9,8 @@ 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.BlockGrowEvent; import org.bukkit.event.block.BlockPlaceEvent; import mineplex.core.common.util.MapUtil; @@ -107,12 +109,24 @@ public class Micro extends TeamGame { Block block = WorldData.World.getBlockAt(x, y, z); - if (block.getType() == Material.AIR || block.isLiquid()) + if (block.getType() == Material.AIR) continue; _blocks.add(block); } } + + @EventHandler + public void preventGrow(BlockGrowEvent event) + { + event.setCancelled(true); + } + + @EventHandler + public void preventFlow(BlockFromToEvent event) + { + event.setCancelled(true); + } @EventHandler public void BlockPlace(BlockPlaceEvent event) From 52f09655e8423b337ae45bcf2b21dd588262b4a6 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 21:58:31 -0500 Subject: [PATCH 42/91] PC-1231 --- .../src/mineplex/core/achievement/Achievement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java index db2e4d154..745df2fee 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java @@ -449,7 +449,7 @@ public enum Achievement CHAMPIONS_SPECIAL_WIN("Champion of Champions", 3000, new String[]{"Champions CTF.SpecialWin"}, - new String[]{"Win the game with 5 more captures than the other team"}, + new String[]{"Win the game with 5 more flag captures than the other team"}, new int[]{1}, AchievementCategory.CHAMPIONS), From 53e8fa9c47069a8635e724108b1d715075f2b287 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 22:35:41 -0500 Subject: [PATCH 43/91] PC-1235 --- .../minecraft/game/classcombat/Skill/Assassin/Blink.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java index bd50cddd3..c74556fae 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Blink.java @@ -56,7 +56,7 @@ public class Blink extends SkillActive "", "Using again within 5 seconds De-Blinks,", "returning you to your original location.", - "Can be used while Slowed." + "Cannot be used while Slowed." }); } From 017d737e5962e6fe4df1316d4a2e65ed160d1a9e Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 15:50:38 -0500 Subject: [PATCH 44/91] PC-1248 PC-1249 --- .../gadgets/morph/MorphPumpkinKing.java | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java index cb13b4ff5..c309fb7a4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import java.util.Random; +import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Item; @@ -32,12 +34,14 @@ import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.morph.managers.UtilMorph; import mineplex.core.gadget.types.MorphGadget; import mineplex.core.itemstack.ItemBuilder; +import mineplex.core.packethandler.IPacketHandler; +import mineplex.core.packethandler.PacketInfo; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.core.visibility.VisibilityManager; -public class MorphPumpkinKing extends MorphGadget +public class MorphPumpkinKing extends MorphGadget implements IPacketHandler { private static final int CROWN_POINTS = 12; @@ -57,6 +61,7 @@ public class MorphPumpkinKing extends MorphGadget -1, Material.PUMPKIN, (byte)0); + manager.getPacketManager().addPacketHandler(this, true, PacketPlayInUseEntity.class); } @Override @@ -123,7 +128,20 @@ public class MorphPumpkinKing extends MorphGadget _bombs.removeIf(bomb -> bomb.update()); } } - + + @Override + public void handle(PacketInfo packetInfo) + { + if (packetInfo.getPacket() instanceof PacketPlayInUseEntity) + { + PacketPlayInUseEntity packetPlayInUseEntity = (PacketPlayInUseEntity) packetInfo.getPacket(); + if (packetPlayInUseEntity.action == PacketPlayInUseEntity.EnumEntityUseAction.ATTACK) + for (JackOBomb bomb : _bombs) + if (bomb._ent.getEntityId() == packetPlayInUseEntity.a) + packetInfo.setCancelled(true); + } + } + private class JackOBomb { private Player _user; @@ -151,6 +169,12 @@ public class MorphPumpkinKing extends MorphGadget { return true; } + if (!_user.isOnline()) + { + Manager.getDisguiseManager().undisguise(_disguise); + _ent.remove(); + _done = true; + } if (System.currentTimeMillis() >= _detonation) { UtilParticle.PlayParticleToAll(ParticleType.HUGE_EXPLOSION, _ent.getLocation(), null, 0, 1, ViewDist.NORMAL); From affb2cb91f82d345ef89fde31bb37431d9732647 Mon Sep 17 00:00:00 2001 From: samczsun Date: Fri, 10 Mar 2017 14:06:52 -0500 Subject: [PATCH 45/91] PC-1395 Don't disable self otherwise a message is shown --- .../gamemodifiers/minestrike/GameModifierMineStrikeSkin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java index df1cf150f..982e97411 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java @@ -86,7 +86,7 @@ public class GameModifierMineStrikeSkin extends GameModifierGadget @Override public void enableCustom(Player player, boolean message) { - Manager.getGameModifiers(getGameType()).stream().filter(getWeaponFilter(_weapon)).forEach(g -> g.disable(player)); + Manager.getGameModifiers(getGameType()).stream().filter(getWeaponFilter(_weapon).and(weapon -> weapon != this)).forEach(g -> g.disable(player)); super.enableCustom(player, message); } From c82697a4e3cc5ee24d7107ed7d1cfc8df5ed2973 Mon Sep 17 00:00:00 2001 From: samczsun Date: Mon, 13 Mar 2017 13:47:03 -0400 Subject: [PATCH 46/91] PC-1396 --- .../src/nautilus/game/arcade/managers/NextBestGameManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java index 80e803d08..b74132e1c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/NextBestGameManager.java @@ -409,6 +409,9 @@ public class NextBestGameManager implements Listener private void handle(Player player) { + if (getGame().IsAlive(player)) + return; + Party party = _partyManager.getPartyByPlayer(player); if (party != null) From c8eab2596f1405ec12c8fcaed7f4364364c145d3 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:10:37 -0500 Subject: [PATCH 47/91] Move package because intellij is complaining --- .../mineplex/core/portal/{Commands => commands}/SendCommand.java | 0 .../core/portal/{Commands => commands}/ServerCommand.java | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Plugins/Mineplex.Core/src/mineplex/core/portal/{Commands => commands}/SendCommand.java (100%) rename Plugins/Mineplex.Core/src/mineplex/core/portal/{Commands => commands}/ServerCommand.java (100%) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/commands/SendCommand.java similarity index 100% rename from Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java rename to Plugins/Mineplex.Core/src/mineplex/core/portal/commands/SendCommand.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/commands/ServerCommand.java similarity index 100% rename from Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/ServerCommand.java rename to Plugins/Mineplex.Core/src/mineplex/core/portal/commands/ServerCommand.java From 4d32efe7797a732016b5c5945d9bd8332178276e Mon Sep 17 00:00:00 2001 From: samczsun Date: Mon, 27 Mar 2017 19:25:56 -0400 Subject: [PATCH 48/91] Not even disguises are safe from the NSA --- .../playerdisguise/DisguiseCommand.java | 9 +++ .../playerdisguise/PlayerDisguiseManager.java | 6 ++ .../PlayerDisguiseNotification.java | 57 +++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseNotification.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java index dfe3d6fb2..ac7443d69 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/DisguiseCommand.java @@ -19,6 +19,10 @@ public class DisguiseCommand extends CommandBase implemen { if (args == null || args.length == 0) { + Plugin.runAsync(() -> + { + new PlayerDisguiseNotification(Plugin.getRealName(caller), caller.getUniqueId(), caller.getName()).publish(); + }); Plugin.undisguise(caller); return; } @@ -28,6 +32,11 @@ public class DisguiseCommand extends CommandBase implemen return; } + Plugin.runAsync(() -> + { + new PlayerDisguiseNotification(Plugin.getRealName(caller), caller.getUniqueId(), args[0], args.length > 1 ? args[1] : args[0]).publish(); + }); + Plugin.disguise(caller, args[0], args.length > 1 ? args[1] : args[0]); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java index 60729ef22..caf2b5b1d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseManager.java @@ -331,6 +331,12 @@ public class PlayerDisguiseManager extends MiniPlugin implements IPacketHandler } } + public String getRealName(Player caller) + { + CoreClient coreClient = _clients.Get(caller); + return coreClient == null ? caller.getName() : coreClient.getName(); + } + public void undisguise(Player caller) { if (!isDisguised(caller)) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseNotification.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseNotification.java new file mode 100644 index 000000000..e63c0ff87 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/playerdisguise/PlayerDisguiseNotification.java @@ -0,0 +1,57 @@ +package mineplex.core.disguise.playerdisguise; + +import java.util.UUID; + +import mineplex.serverdata.commands.ServerCommand; + +public class PlayerDisguiseNotification extends ServerCommand +{ + private String _realPlayerName; + private UUID _playerUUID; + private boolean _disguising; + private String _disguisedName; + private String _disguisedSkin; + + public PlayerDisguiseNotification(String realPlayerName, UUID playerUUID, String disguisedName, String disguisedSkin) + { + _realPlayerName = realPlayerName; + _playerUUID = playerUUID; + _disguising = true; + _disguisedName = disguisedName; + _disguisedSkin = disguisedSkin; + } + + public PlayerDisguiseNotification(String realPlayerName, UUID playerUUID, String disguisedName) + { + _realPlayerName = realPlayerName; + _playerUUID = playerUUID; + _disguising = false; + _disguisedName = disguisedName; + _disguisedSkin = null; + } + + public String getRealPlayerName() + { + return _realPlayerName; + } + + public UUID getPlayerUUID() + { + return _playerUUID; + } + + public boolean isDisguising() + { + return _disguising; + } + + public String getDisguisedName() + { + return _disguisedName; + } + + public String getDisguisedSkin() + { + return _disguisedSkin; + } +} From 911d5d20d23f847aa050fab855405a46d620a5b0 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Fri, 31 Mar 2017 01:07:00 -0300 Subject: [PATCH 49/91] Reverted rename --- .../fountain/GemFountainSalesPackage.java | 6 +- .../mineplex/core/gadget/gadgets/Ammo.java | 10 ++- .../arrowtrail/freedom/ArrowTrailFreedom.java | 2 +- .../arrowtrail/titan/ArrowTrailTitan.java | 4 +- .../gadgets/death/titan/DeathTitan.java | 4 +- .../doublejump/titan/DoubleJumpTitan.java | 4 +- .../gamemodifiers/kits/KitGameModifier.java | 2 +- .../GameModifierMineStrikeSkin.java | 2 +- .../core/gadget/gadgets/item/ItemBatGun.java | 25 ++++---- .../core/gadget/gadgets/item/ItemBow.java | 4 +- .../core/gadget/gadgets/item/ItemCoal.java | 47 +++++++------- .../gadget/gadgets/item/ItemCoinBomb.java | 2 +- .../gadget/gadgets/item/ItemDuelingSword.java | 4 +- .../gadget/gadgets/item/ItemFleshHook.java | 4 +- .../gadget/gadgets/item/ItemFreezeCannon.java | 8 +-- .../gadget/gadgets/item/ItemLovePotion.java | 14 ++--- .../gadgets/item/ItemMelonLauncher.java | 2 +- .../gadget/gadgets/item/ItemPaintbrush.java | 8 +-- .../gadget/gadgets/item/ItemSnowball.java | 2 +- .../core/gadget/gadgets/item/ItemTNT.java | 2 +- .../core/gadget/gadgets/morph/BlockForm.java | 12 ++-- .../core/gadget/gadgets/morph/MorphBat.java | 6 +- .../core/gadget/gadgets/morph/MorphBlaze.java | 8 +-- .../core/gadget/gadgets/morph/MorphBunny.java | 10 +-- .../gadget/gadgets/morph/MorphChicken.java | 4 +- .../gadgets/morph/MorphChristmasKing.java | 8 +-- .../core/gadget/gadgets/morph/MorphCow.java | 4 +- .../gadget/gadgets/morph/MorphCreeper.java | 16 ++--- .../gadget/gadgets/morph/MorphDinnerbone.java | 8 ++- .../gadget/gadgets/morph/MorphEnderman.java | 4 +- .../gadget/gadgets/morph/MorphGoldPot.java | 6 +- .../gadget/gadgets/morph/MorphGrimReaper.java | 4 +- .../gadget/gadgets/morph/MorphLoveDoctor.java | 4 +- .../gadget/gadgets/morph/MorphMetalMan.java | 4 +- .../core/gadget/gadgets/morph/MorphPig.java | 10 +-- .../gadgets/morph/MorphPumpkinKing.java | 12 ++-- .../core/gadget/gadgets/morph/MorphSanta.java | 12 ++-- .../core/gadget/gadgets/morph/MorphSlime.java | 4 +- .../gadget/gadgets/morph/MorphSnowman.java | 6 +- .../core/gadget/gadgets/morph/MorphSquid.java | 8 +-- .../core/gadget/gadgets/morph/MorphStray.java | 6 +- .../core/gadget/gadgets/morph/MorphTitan.java | 18 +++--- .../gadget/gadgets/morph/MorphTurkey.java | 4 +- .../gadget/gadgets/morph/MorphUncleSam.java | 4 +- .../gadget/gadgets/morph/MorphVillager.java | 14 ++--- .../core/gadget/gadgets/morph/MorphWitch.java | 10 +-- .../gadget/gadgets/morph/MorphWither.java | 14 ++--- .../gadget/gadgets/outfit/OutfitTeam.java | 6 +- .../outfit/freezesuit/OutfitFreezeSuit.java | 10 +-- .../particle/ParticleChristmasTree.java | 2 +- .../gadgets/particle/ParticleCoalFumes.java | 2 +- .../gadgets/particle/ParticleFireRings.java | 2 +- .../gadgets/particle/ParticleKronos.java | 6 +- .../gadgets/particle/ParticleLegend.java | 4 +- .../gadgets/particle/ParticleWingsAngel.java | 2 +- .../gadgets/particle/ParticleWingsDemons.java | 2 +- .../particle/ParticleWingsInfernal.java | 2 +- .../gadgets/particle/ParticleWingsLove.java | 2 +- .../gadgets/particle/ParticleWingsPixie.java | 2 +- .../gadgets/particle/ParticleYinYang.java | 2 +- .../particle/candycane/ParticleCandyCane.java | 2 +- .../particle/cupidslove/ParticleHeart.java | 2 +- .../particle/emerald/ParticleEmerald.java | 2 +- .../particle/freedom/ParticleFreedom.java | 2 +- .../particle/frostlord/ParticleFrostLord.java | 2 +- .../particle/howlingwinds/ParticleRain.java | 2 +- .../gadgets/particle/music/ParticleMusic.java | 4 +- .../particle/party/ParticlePartyTime.java | 4 +- .../gadgets/particle/shadow/ParticleFoot.java | 4 +- .../gadgets/particle/titan/ParticleTitan.java | 6 +- .../particle/vampire/ParticleBlood.java | 2 +- .../particle/wisdom/ParticleEnchant.java | 2 +- .../gadget/gadgets/taunts/EternalTaunt.java | 8 +-- .../gadget/gadgets/taunts/RainbowTaunt.java | 2 +- .../wineffect/WinEffectBabyChicken.java | 2 +- .../gadgets/wineffect/WinEffectFireworks.java | 2 +- .../gadgets/wineffect/WinEffectFlames.java | 2 +- .../gadgets/wineffect/WinEffectHalloween.java | 4 +- .../wineffect/WinEffectLightningStrike.java | 2 +- .../WinEffectLoveIsABattlefield.java | 4 +- .../gadgets/wineffect/WinEffectPodium.java | 4 +- .../WinEffectRiseOfTheElderGuardian.java | 10 +-- .../wineffect/WinEffectSnowTrails.java | 2 +- .../wineffect/WinEffectWinterWarfare.java | 2 +- .../core/gadget/types/ArrowEffectGadget.java | 4 +- .../core/gadget/types/BalloonGadget.java | 4 +- .../core/gadget/types/DeathEffectGadget.java | 2 +- .../gadget/types/DoubleJumpEffectGadget.java | 2 +- .../mineplex/core/gadget/types/Gadget.java | 50 ++++++++------- .../mineplex/core/gadget/types/HatGadget.java | 4 +- .../core/gadget/types/ItemGadget.java | 34 ++++------ .../core/gadget/types/MorphGadget.java | 2 +- .../core/gadget/types/MusicGadget.java | 2 +- .../core/gadget/types/OutfitGadget.java | 4 +- .../core/gadget/types/ParticleGadget.java | 4 +- .../core/gadget/types/WinEffectGadget.java | 8 +-- .../src/mineplex/core/mount/DragonMount.java | 2 +- .../src/mineplex/core/mount/HorseMount.java | 4 +- .../mineplex/core/mount/types/MountCart.java | 2 +- .../mineplex/core/mount/types/MountSlime.java | 2 +- .../core/particleeffects/BlowAKissEffect.java | 2 +- .../particleeffects/LoveDoctorEffect.java | 4 +- .../core/particleeffects/MetalManEffect.java | 4 +- .../core/pet/sales/PetExtraSalesPackage.java | 6 +- .../core/pet/sales/PetSalesPackage.java | 4 +- .../core/shop/item/SalesPackageBase.java | 63 +++++++++---------- .../mineplex/core/treasure/ChestPackage.java | 4 +- .../mineplex/core/treasure/TreasureKey.java | 4 +- .../goals/classes/SelectBullsChargeGoal.java | 2 +- .../src/mineplex/hub/modules/TextManager.java | 14 ++--- .../shop/salespackage/ItemSalesPackage.java | 6 +- .../shop/salespackage/SkillSalesPackage.java | 6 +- .../game/core/condition/ConditionFactory.java | 2 +- .../arcade/game/games/event/EventGame.java | 2 +- .../games/evolution/mobs/KitSkeleton.java | 2 +- .../game/games/evolution/mobs/KitSnowman.java | 2 +- .../game/arcade/kit/perks/PerkDestructor.java | 2 +- .../game/arcade/kit/perks/PerkSquidRifle.java | 2 +- .../arcade/kit/perks/PerkSquidShotgun.java | 2 +- .../arcade/kit/perks/PerkSquidSniper.java | 2 +- .../nautilus/game/arcade/shop/KitPackage.java | 4 +- 121 files changed, 380 insertions(+), 387 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java index e34c8bac1..d0ba3e882 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/brawl/fountain/GemFountainSalesPackage.java @@ -13,8 +13,8 @@ public class GemFountainSalesPackage extends SalesPackageBase { super("Add " + gems + " Gems", Material.EMERALD, (byte) 0, new String[] {}, gems, 1); - _currencyCostMap.put(GlobalCurrency.GEM, gems); - _knownPackage = false; - _oneTimePurchaseOnly = false; + CurrencyCostMap.put(GlobalCurrency.GEM, gems); + KnownPackage = false; + OneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java index 366f34d4d..4f6f3b421 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/Ammo.java @@ -1,8 +1,7 @@ package mineplex.core.gadget.gadgets; -import org.bukkit.Material; - import mineplex.core.shop.item.SalesPackageBase; +import org.bukkit.Material; public class Ammo extends SalesPackageBase { @@ -10,9 +9,8 @@ public class Ammo extends SalesPackageBase { super(name, material, displayData, description, coins, quantity); - _displayName = displayName; - _knownPackage = false; - _oneTimePurchaseOnly = false; - _free = coins == -5; + DisplayName = displayName; + KnownPackage = false; + OneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java index 9641ef4e2..8921b26cc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/freedom/ArrowTrailFreedom.java @@ -58,7 +58,7 @@ public class ArrowTrailFreedom extends ArrowEffectGadget @Override public void doHitEffect(Arrow arrow) { - BabyFireworkEffect babyFireworkEffect = new BabyFireworkEffect(arrow.getLocation(), _manager.getPlugin(), _color); + BabyFireworkEffect babyFireworkEffect = new BabyFireworkEffect(arrow.getLocation(), Manager.getPlugin(), _color); babyFireworkEffect.start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java index ed3c9b54f..956055929 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/arrowtrail/titan/ArrowTrailTitan.java @@ -43,9 +43,9 @@ public class ArrowTrailTitan extends ArrowEffectGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java index f116b5d65..00b64eace 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/titan/DeathTitan.java @@ -32,9 +32,9 @@ public class DeathTitan extends DeathEffectGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java index f24d33720..336aaa5bc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/doublejump/titan/DoubleJumpTitan.java @@ -37,9 +37,9 @@ public class DoubleJumpTitan extends DoubleJumpEffectGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java index 28bf3f45d..d06bffbe8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/kits/KitGameModifier.java @@ -39,7 +39,7 @@ public class KitGameModifier extends GameModifierGadget @Override public void enableCustom(Player player, boolean message) { - _manager.getGameModifiers(getGameType()).stream().filter(getKitFilter(_kitType)).forEach(g -> g.disable(player)); + Manager.getGameModifiers(getGameType()).stream().filter(getKitFilter(_kitType)).forEach(g -> g.disable(player)); super.enableCustom(player, message); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java index fb83978b9..df1cf150f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java @@ -86,7 +86,7 @@ public class GameModifierMineStrikeSkin extends GameModifierGadget @Override public void enableCustom(Player player, boolean message) { - _manager.getGameModifiers(getGameType()).stream().filter(getWeaponFilter(_weapon)).forEach(g -> g.disable(player)); + Manager.getGameModifiers(getGameType()).stream().filter(getWeaponFilter(_weapon)).forEach(g -> g.disable(player)); super.enableCustom(player, message); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java index 8c90a821a..67aa5cc1e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBatGun.java @@ -1,16 +1,5 @@ package mineplex.core.gadget.gadgets.item; -import java.util.ArrayList; -import java.util.HashMap; - -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Sound; -import org.bukkit.entity.Bat; -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.util.Vector; - import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.LineFormat; @@ -31,6 +20,16 @@ import mineplex.core.preferences.Preference; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.entity.Bat; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.util.Vector; + +import java.util.ArrayList; +import java.util.HashMap; public class ItemBatGun extends ItemGadget { @@ -103,7 +102,7 @@ public class ItemBatGun extends ItemGadget if (other.equals(cur)) continue; - if (!_manager.getPreferencesManager().get(other).isActive(Preference.HUB_GAMES) || !_manager.getPreferencesManager().get(other).isActive(Preference.SHOW_PLAYERS)) + if (!Manager.getPreferencesManager().get(other).isActive(Preference.HUB_GAMES) || !Manager.getPreferencesManager().get(other).isActive(Preference.SHOW_PLAYERS)) continue; if (!Recharge.Instance.usable(other, "Hit by Bat")) @@ -111,7 +110,7 @@ public class ItemBatGun extends ItemGadget if (UtilEnt.hitBox(bat.getLocation(), other, 2, null)) { - if (_manager.collideEvent(cur, this, other)) + if (Manager.collideEvent(cur, this, other)) continue; //Damage Event diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java index c909c74fb..16e78ec14 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBow.java @@ -92,7 +92,7 @@ public class ItemBow extends ItemGadget UtilText.splitLineToArray(C.cGray + "This symbol of love will live on with you forever! Mainly because we couldn't attach the cupid wings to it. I guess duct tape can't fix everything!", LineFormat.LORE), -6, Material.BOW, (byte) 0, 1000, new Ammo("Cupid Arrow", "Cupid's Arrows", Material.ARROW, (byte) 0, UtilText.splitLineToArray(C.cGray + "Use these arrows to shoot love into people's hearts!", LineFormat.LORE), -6, 15)); - _manager.getPacketManager().addPacketHandler(_packetHandler, PacketPlayOutSpawnEntity.class); + Manager.getPacketManager().addPacketHandler(_packetHandler, PacketPlayOutSpawnEntity.class); } @Override @@ -134,7 +134,7 @@ public class ItemBow extends ItemGadget if (!_arrows.contains(arrow)) return; - Bukkit.getScheduler().runTaskLater(_manager.getPlugin(), new Runnable() + Bukkit.getScheduler().runTaskLater(Manager.getPlugin(), new Runnable() { @Override public void run() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java index 8b1b2cf60..118f1b8b9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoal.java @@ -3,6 +3,7 @@ package mineplex.core.gadget.gadgets.item; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; +import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; @@ -82,16 +83,16 @@ public class ItemCoal extends ItemGadget int goal = -1; //Coal Hat - if (!_manager.getHatGadget(HatType.COAL).ownsGadget(player)) + if (!Manager.getHatGadget(HatType.COAL).ownsGadget(player)) { goal = _hat; - if(_manager.getInventoryManager().Get(player).getItemCount(getName()) >= _hat) + if(Manager.getInventoryManager().Get(player).getItemCount(getName()) >= _hat) { Recharge.Instance.recharge(player, getName()); Recharge.Instance.use(player, getName(), 30000, true, true); - _manager.getInventoryManager().addItemToInventory(new Callback() + Manager.getInventoryManager().addItemToInventory(new Callback() { @Override public void run(Boolean data) @@ -103,10 +104,10 @@ public class ItemCoal extends ItemGadget UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation(), 0.5f, 0.0f, 0.5f, 0, 100, ViewDist.LONG); player.getWorld().playSound(player.getLocation(), Sound.WITHER_DEATH, 0.8f, 0); - _manager.getInventoryManager().addItemToInventory(player, getName(), -_hat); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + Manager.getInventoryManager().addItemToInventory(player, getName(), -_hat); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); - _manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Lump of Coal Hat"); + Manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Lump of Coal Hat"); UtilServer.CallEvent(new PlayerUseCoalEvent(player, PlayerUseCoalEvent.CoalReward.HAT, _particle)); } @@ -121,19 +122,19 @@ public class ItemCoal extends ItemGadget } //Coal Apparition - if (!_manager.getPetManager().Get(player).getPets().containsKey(PetType.PIG_ZOMBIE)) + if (!Manager.getPetManager().Get(player).getPets().containsKey(PetType.PIG_ZOMBIE)) { goal = _pet; - if(_manager.getInventoryManager().Get(player).getItemCount(getName()) >= _pet) + if(Manager.getInventoryManager().Get(player).getItemCount(getName()) >= _pet) { Recharge.Instance.recharge(player, getName()); Recharge.Instance.use(player, getName(), 30000, true, true); PetReward reward = new PetReward( - _manager.getPetManager(), - _manager.getInventoryManager(), - _manager.getDonationManager(), + Manager.getPetManager(), + Manager.getInventoryManager(), + Manager.getDonationManager(), "Coal Apparition", "Coal Apparition", PetType.PIG_ZOMBIE, RewardRarity.OTHER, 0, 0); if (reward.canGiveReward(player)) @@ -147,10 +148,10 @@ public class ItemCoal extends ItemGadget UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation(), 1f, 0.0f, 1f, 0, 250, ViewDist.LONG); player.getWorld().playSound(player.getLocation(), Sound.WITHER_DEATH, 0.8f, 0); - _manager.getInventoryManager().addItemToInventory(player, getName(), -_pet); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + Manager.getInventoryManager().addItemToInventory(player, getName(), -_pet); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); - _manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Apparition"); + Manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Apparition"); UtilServer.CallEvent(new PlayerUseCoalEvent(player, PlayerUseCoalEvent.CoalReward.PET, _particle)); } @@ -161,16 +162,16 @@ public class ItemCoal extends ItemGadget } //Coal Particle - if (!_manager.getGadget(ParticleCoalFumes.class).ownsGadget(player)) + if (!Manager.getGadget(ParticleCoalFumes.class).ownsGadget(player)) { goal = _particle; - if(_manager.getInventoryManager().Get(player).getItemCount(getName()) >= _particle) + if(Manager.getInventoryManager().Get(player).getItemCount(getName()) >= _particle) { Recharge.Instance.recharge(player, getName()); Recharge.Instance.use(player, getName(), 30000, true, true); - _manager.getInventoryManager().addItemToInventory(new Callback() + Manager.getInventoryManager().addItemToInventory(new Callback() { @Override public void run(Boolean data) @@ -182,10 +183,10 @@ public class ItemCoal extends ItemGadget UtilParticle.PlayParticleToAll(ParticleType.LARGE_SMOKE, player.getLocation(), 1.5f, 0.0f, 1.5f, 0, 500, ViewDist.LONG); player.getWorld().playSound(player.getLocation(), Sound.WITHER_DEATH, 0.8f, 0); - _manager.getInventoryManager().addItemToInventory(player, getName(), -_particle); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + Manager.getInventoryManager().addItemToInventory(player, getName(), -_particle); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); - _manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Fumes"); + Manager.getDonationManager().Get(player).addOwnedUnknownSalesPackage("Coal Fumes"); UtilServer.CallEvent(new PlayerUseCoalEvent(player, PlayerUseCoalEvent.CoalReward.PARTICLE, _particle)); } @@ -199,7 +200,7 @@ public class ItemCoal extends ItemGadget } } - goal -= _manager.getInventoryManager().Get(player).getItemCount(getName()); + goal -= Manager.getInventoryManager().Get(player).getItemCount(getName()); if (goal > 0 && Math.random() > 0.95) { @@ -238,7 +239,7 @@ public class ItemCoal extends ItemGadget event.setCancelled(true); //Stock - if (_manager.getInventoryManager().Get(player).getItemCount(getName()) <= 0) + if (Manager.getInventoryManager().Get(player).getItemCount(getName()) <= 0) { UtilPlayer.message(player, F.main("Gadget", "You do not have any " + getName() + " left.")); @@ -256,7 +257,7 @@ public class ItemCoal extends ItemGadget return; } - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); ActivateCustom(event.getPlayer()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java index 6d63dacd4..7334375b3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemCoinBomb.java @@ -110,7 +110,7 @@ public class ItemCoinBomb extends ItemGadget event.setCancelled(true); event.getItem().remove(); - _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Pickup", 4); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Pickup", 4); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1f, 2f); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java index 62a2fa0a1..09d4499ae 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemDuelingSword.java @@ -28,11 +28,11 @@ public class ItemDuelingSword extends ItemGadget @Override public void ApplyItem(Player player, boolean inform) { - _manager.removeGadgetType(player, GadgetType.ITEM); + Manager.removeGadgetType(player, GadgetType.ITEM); _active.add(player); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, "PvP Sword")); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(Material.GOLD_SWORD, (byte)0, 1, "PvP Sword")); } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java index ee030a9f6..6c454ebff 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFleshHook.java @@ -44,7 +44,7 @@ public class ItemFleshHook extends ItemGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 1.6, false, 0, 0.2, 10, false); - _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, Sound.FIRE_IGNITE, 1.4f, 0.8f, ParticleType.CRIT, null, 0, UpdateType.TICK, 0.5f); //Inform @@ -67,7 +67,7 @@ public class ItemFleshHook extends ItemGadget implements IThrown if (target == null) return; - if (_manager.collideEvent(player, this, target)) + if (Manager.collideEvent(player, this, target)) return; if (target instanceof ArmorStand) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java index a08e19136..ce3e899d1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFreezeCannon.java @@ -61,7 +61,7 @@ public class ItemFreezeCannon extends ItemGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 1, false, 0, 0.2, 10, false); - _manager.getProjectileManager().AddThrow(item, player, this, 5000, true, true, true, true, + Manager.getProjectileManager().AddThrow(item, player, this, 5000, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); //Inform @@ -81,11 +81,11 @@ public class ItemFreezeCannon extends ItemGadget implements IThrown int ticks = 4 * 20; if(isClear(p.getLocation())) { - _manager.getBlockRestore().add(p.getLocation().getBlock(), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); - _manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.UP), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); + Manager.getBlockRestore().add(p.getLocation().getBlock(), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); + Manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.UP), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); if(p.getLocation().getBlock().getRelative(BlockFace.DOWN).getType() == Material.AIR) { - _manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.DOWN), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); + Manager.getBlockRestore().add(p.getLocation().getBlock().getRelative(BlockFace.DOWN), Material.STAINED_GLASS.getId(), (byte)5, 0, (byte)0, ticks*50); } p.setWalkSpeed(0); _playerMap.put(p, System.currentTimeMillis() + (ticks * 50)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java index 22eda4fd1..f2246773c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemLovePotion.java @@ -72,16 +72,16 @@ public class ItemLovePotion extends ItemGadget @Override public void ApplyItem(Player player, boolean inform) { - _manager.removeGadgetType(player, GadgetType.ITEM); + Manager.removeGadgetType(player, GadgetType.ITEM); _active.add(player); List itemLore = new ArrayList(); itemLore.addAll(Arrays.asList(getDescription())); itemLore.add(C.cBlack); - itemLore.add(C.cWhite + "Your Ammo : " + _manager.getInventoryManager().Get(player).getItemCount(getName())); + itemLore.add(C.cWhite + "Your Ammo : " + Manager.getInventoryManager().Get(player).getItemCount(getName())); - player.getInventory().setItem(_manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); + player.getInventory().setItem(Manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); if (inform) UtilPlayer.message(player, F.main("Gadget", "You equipped " + F.elem(getName()) + ".")); @@ -130,12 +130,12 @@ public class ItemLovePotion extends ItemGadget Recharge.Instance.use(player, getName(), getName(), _recharge, _recharge > 1000, true, false, true, "Cosmetics"); // Cooldown - _manager.getInventoryManager().addItemToInventory(player, getName(), -1); + Manager.getInventoryManager().addItemToInventory(player, getName(), -1); ItemGadgetUseEvent itemGadgetUseEvent = new ItemGadgetUseEvent(player, this, 1); UtilServer.CallEvent(itemGadgetUseEvent); - player.getInventory().setItem(_manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); + player.getInventory().setItem(Manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); } @EventHandler @@ -181,9 +181,9 @@ public class ItemLovePotion extends ItemGadget String message = UtilMath.randomElement(DRINK_MESSAGES); UtilPlayer.message(player, F.main("Potion", message)); - _manager.getInventoryManager().addItemToInventory(player, getName(), -1); + Manager.getInventoryManager().addItemToInventory(player, getName(), -1); - player.getInventory().setItem(_manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); + player.getInventory().setItem(Manager.getActiveItemSlot(), new ItemBuilder(getDisplayMaterial(), getDisplayData()).setTitle(F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName())).setHideInfo(true).build()); ItemGadgetUseEvent itemGadgetUseEvent = new ItemGadgetUseEvent(player, this, 1); UtilServer.CallEvent(itemGadgetUseEvent); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java index b85871689..264118b41 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemMelonLauncher.java @@ -59,7 +59,7 @@ public class ItemMelonLauncher extends ItemGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 1, false, 0, 0.2, 10, false); - _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); //Inform diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java index 4ff638648..98171d0c3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemPaintbrush.java @@ -52,14 +52,14 @@ public class ItemPaintbrush extends ItemGadget @Override public void ApplyItem(Player player, boolean inform) { - _manager.removeGadgetType(player, GadgetType.ITEM); + Manager.removeGadgetType(player, GadgetType.ITEM); _active.add(player); List itemLore = new ArrayList(); itemLore.addAll(Arrays.asList(getDescription())); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, getName())); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, getName())); if (inform) UtilPlayer.message(player, F.main("Gadget", "You equipped " + F.elem(getName()) + ".")); @@ -161,7 +161,7 @@ public class ItemPaintbrush extends ItemGadget continue; //Color - _manager.getBlockRestore().add(block, 35, _brushColor.get(player.getName()), 30000); + Manager.getBlockRestore().add(block, 35, _brushColor.get(player.getName()), 30000); //Join Dots if (_brushPrevious.containsKey(player.getName())) @@ -175,7 +175,7 @@ public class ItemPaintbrush extends ItemGadget if (fixBlock.getType() != Material.WOOL) continue; - _manager.getBlockRestore().add(fixBlock, 35, _brushColor.get(player.getName()), 30000); + Manager.getBlockRestore().add(fixBlock, 35, _brushColor.get(player.getName()), 30000); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java index 7d6677593..ebca74d1f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemSnowball.java @@ -55,7 +55,7 @@ public class ItemSnowball extends ItemGadget if(!_snowballs.containsKey(ball)) return; - if(_manager.collideEvent(_snowballs.remove(ball), this, event.getEntity())) return; + if(Manager.collideEvent(_snowballs.remove(ball), this, event.getEntity())) return; if (event.getEntity() instanceof ArmorStand) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java index 6cfdf587d..eecba68e1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemTNT.java @@ -65,7 +65,7 @@ public class ItemTNT extends ItemGadget HashMap players = UtilPlayer.getInRadius(event.getLocation(), 8); for (Player player : players.keySet()) { - if (_manager.collideEvent(killer, this, player)) + if (Manager.collideEvent(killer, this, player)) continue; double mult = players.get(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java index adc6cea4c..2b1c13ea3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/BlockForm.java @@ -69,7 +69,7 @@ public class BlockForm _hiddenDisguise = new DisguiseSlime(player); _hiddenDisguise.setInvisible(true); - _host._manager.getDisguiseManager().disguise(_hiddenDisguise); + _host.Manager.getDisguiseManager().disguise(_hiddenDisguise); this._fallingBlock = _loc.getWorld().spawn(_loc, Slime.class); this._fallingBlock.setSize(0); @@ -92,7 +92,7 @@ public class BlockForm _disguiseBlockBase = new DisguiseSlime(_fallingBlockBase); _disguiseBlockBase.SetSize(0); _disguiseBlockBase.setInvisible(true); - _host._manager.getDisguiseManager().disguise(_disguiseBlockBase); + _host.Manager.getDisguiseManager().disguise(_disguiseBlockBase); reset(); } @@ -103,7 +103,7 @@ public class BlockForm _disguiseBlock = new DisguiseBlock(_fallingBlock, _blockMat.getId(), _blockData); _disguiseBlock.setHideIfNotDisguised(true); - _host._manager.getDisguiseManager().disguise(_disguiseBlock); + _host.Manager.getDisguiseManager().disguise(_disguiseBlock); _fallingBlockBase.setPassenger(_fallingBlock); } @@ -112,7 +112,7 @@ public class BlockForm { if (_disguiseBlock != null) { - _host._manager.getDisguiseManager().undisguise(_disguiseBlock); + _host.Manager.getDisguiseManager().undisguise(_disguiseBlock); _disguiseBlock = null; _fallingBlockBase.setPassenger(null); } @@ -142,8 +142,8 @@ public class BlockForm removeSolidBlock(); removeFallingBlock(); - _host._manager.getDisguiseManager().undisguise(_hiddenDisguise); - _host._manager.getDisguiseManager().undisguise(_disguiseBlockBase); + _host.Manager.getDisguiseManager().undisguise(_hiddenDisguise); + _host.Manager.getDisguiseManager().undisguise(_disguiseBlockBase); _fallingBlockBase.remove(); _fallingBlockBase = null; _fallingBlock.remove(); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java index ada824454..4225b2c6b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBat.java @@ -60,14 +60,14 @@ public class MorphBat extends MorphGadget implements IThrown this.applyArmor(player, message); DisguiseBat disguise = new DisguiseBat(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); @@ -113,7 +113,7 @@ public class MorphBat extends MorphGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 0.01, true, -0.3, 0, 10, false); - _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); //Inform diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java index 592ad0b5f..abd40e459 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBlaze.java @@ -43,14 +43,14 @@ public class MorphBlaze extends MorphGadget this.applyArmor(player, message); DisguiseBlaze disguise = new DisguiseBlaze(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler @@ -81,9 +81,9 @@ public class MorphBlaze extends MorphGadget @EventHandler public void HeroOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java index 91fb1f916..ef51b27f4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphBunny.java @@ -71,7 +71,7 @@ public class MorphBunny extends MorphGadget this.applyArmor(player, message); DisguiseRabbit disguise = new DisguiseRabbit(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); player.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 999999999, 1)); player.addPotionEffect(new PotionEffect(PotionEffectType.JUMP, 999999999, 1)); @@ -82,7 +82,7 @@ public class MorphBunny extends MorphGadget { _jumpCharge.remove(player); this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.removePotionEffect(PotionEffectType.SPEED); player.removePotionEffect(PotionEffectType.JUMP); @@ -150,7 +150,7 @@ public class MorphBunny extends MorphGadget if (!UtilEvent.isAction(event, ActionType.L)) return; - if (_manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < 500) + if (Manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < 500) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards.")); return; @@ -170,7 +170,7 @@ public class MorphBunny extends MorphGadget UtilAction.velocity(egg, player.getLocation().getDirection(), 0.2, false, 0, 0.2, 1, false); - _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Egg Hide", -500); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Egg Hide", -500); egg.setPickupDelay(40); @@ -197,7 +197,7 @@ public class MorphBunny extends MorphGadget event.setCancelled(true); event.getItem().remove(); - _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Egg Pickup", 450); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Egg Pickup", 450); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1.5f, 0.75f); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1.5f, 1.25f); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java index 56da39934..ce37ddde3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChicken.java @@ -49,14 +49,14 @@ public class MorphChicken extends MorphGadget this.applyArmor(player, message); DisguiseChicken disguise = new DisguiseChicken(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java index 398c547b6..24803972f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphChristmasKing.java @@ -66,7 +66,7 @@ public class MorphChristmasKing extends MorphGadget DisguiseSkeleton disguise = new DisguiseSkeleton(player); disguise.showArmor(); disguise.SetSkeletonType(SkeletonType.WITHER); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); player.getInventory().setHelmet(new ItemStack(Material.JACK_O_LANTERN)); @@ -78,7 +78,7 @@ public class MorphChristmasKing extends MorphGadget public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.getInventory().setHelmet(null); } @@ -119,7 +119,7 @@ public class MorphChristmasKing extends MorphGadget { for (Player player : getActive()) { - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { continue; } @@ -163,7 +163,7 @@ public class MorphChristmasKing extends MorphGadget if (!_snowball.containsKey(proj)) return; - if (_manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) + if (Manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) return; UtilAction.velocity(event.getEntity(), proj.getVelocity().multiply(0.15).add(new Vector(0, 0.15, 0))); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java index cf7258be7..f8d334a12 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCow.java @@ -37,14 +37,14 @@ public class MorphCow extends MorphGadget this.applyArmor(player, message); DisguiseCow disguise = new DisguiseCow(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java index 54396a316..bcce06361 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphCreeper.java @@ -51,14 +51,14 @@ public class MorphCreeper extends MorphGadget this.applyArmor(player, message); DisguiseCreeper disguise = new DisguiseCreeper(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler @@ -111,7 +111,7 @@ public class MorphCreeper extends MorphGadget if (other.equals(player)) continue; - if (_manager.collideEvent(player, this, other)) + if (Manager.collideEvent(player, this, other)) continue; double mult = players.get(other); @@ -127,7 +127,7 @@ public class MorphCreeper extends MorphGadget public DisguiseCreeper GetDisguise(Player player) { - DisguiseBase disguise = _manager.getDisguiseManager().getDisguise(player); + DisguiseBase disguise = Manager.getDisguiseManager().getDisguise(player); if (disguise == null) return null; @@ -152,7 +152,7 @@ public class MorphCreeper extends MorphGadget creeper.a(-1); - _manager.getDisguiseManager().updateDisguise(creeper); + Manager.getDisguiseManager().updateDisguise(creeper); } public void IncreaseSize(Player player) @@ -162,15 +162,15 @@ public class MorphCreeper extends MorphGadget creeper.a(1); - _manager.getDisguiseManager().updateDisguise(creeper); + Manager.getDisguiseManager().updateDisguise(creeper); } @EventHandler public void HeroOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.HERO)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java index 0f2907d90..ba67af21c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java @@ -10,6 +10,7 @@ import java.util.UUID; import net.minecraft.server.v1_8_R3.DataWatcher; import net.minecraft.server.v1_8_R3.EntityArmorStand; +import net.minecraft.server.v1_8_R3.EntitySlime; import net.minecraft.server.v1_8_R3.MathHelper; import net.minecraft.server.v1_8_R3.PacketPlayOutAttachEntity; import net.minecraft.server.v1_8_R3.PacketPlayOutEntityDestroy; @@ -32,6 +33,7 @@ import mineplex.core.Managers; import mineplex.core.account.CoreClientManager; import mineplex.core.common.DummyEntity; import mineplex.core.common.Rank; +import mineplex.core.common.skin.SkinData; import mineplex.core.common.util.C; import mineplex.core.common.util.LineFormat; import mineplex.core.common.util.UtilEnt; @@ -90,7 +92,7 @@ public class MorphDinnerbone extends MorphGadget implements IPacketHandler disguisePlayer.setSendSkinDataToSelf(false); disguisePlayer.setReplaceOriginalName(false, 10); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, _manager); + UtilMorph.disguise(player, disguisePlayer, Manager); } @Override @@ -98,7 +100,7 @@ public class MorphDinnerbone extends MorphGadget implements IPacketHandler { removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @Override @@ -118,7 +120,7 @@ public class MorphDinnerbone extends MorphGadget implements IPacketHandler } Player owner = (Player) entity; - if (_manager.getActive(owner, GadgetType.MORPH) == this) + if (Manager.getActive(owner, GadgetType.MORPH) == this) { summonForEntity(packetInfo.getPlayer(), owner); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java index 1ee120535..761003e4d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphEnderman.java @@ -48,14 +48,14 @@ public class MorphEnderman extends MorphGadget this.applyArmor(player, message); DisguiseEnderman disguise = new DisguiseEnderman(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java index bf2ce7239..017c3642f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGoldPot.java @@ -47,10 +47,10 @@ public class MorphGoldPot extends MorphGadget { applyArmor(player, message); - _helpers.put(player, new GoldPotHelper(player, _manager, this)); + _helpers.put(player, new GoldPotHelper(player, Manager, this)); DisguiseBlock disguiseBlock = new DisguiseBlock(player, Material.CAULDRON, (byte) 0); - UtilMorph.disguise(player, disguiseBlock, _manager); + UtilMorph.disguise(player, disguiseBlock, Manager); } @Override @@ -65,7 +65,7 @@ public class MorphGoldPot extends MorphGadget _helpers.remove(player); } - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java index 5fbabe83e..44c761772 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphGrimReaper.java @@ -98,7 +98,7 @@ public class MorphGrimReaper extends MorphGadget skeleton.setChestplate(blackChest); skeleton.setLeggings(blackPants); skeleton.setBoots(blackBoots); - UtilMorph.disguise(player, skeleton, _manager.getDisguiseManager()); + UtilMorph.disguise(player, skeleton, Manager.getDisguiseManager()); } @Override @@ -110,7 +110,7 @@ public class MorphGrimReaper extends MorphGadget _flying.remove(player); _flyReady.remove(player); _soulManager.resetSouls(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.getInventory().setItem(2, new ItemStack(Material.AIR)); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java index 0f277d2c5..1a96f75d1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphLoveDoctor.java @@ -47,7 +47,7 @@ public class MorphLoveDoctor extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, gameProfile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, _manager); + UtilMorph.disguise(player, disguisePlayer, Manager); } @Override @@ -55,7 +55,7 @@ public class MorphLoveDoctor extends MorphGadget { removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java index 729f4e534..06838168e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphMetalMan.java @@ -72,7 +72,7 @@ public class MorphMetalMan extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, gameProfile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, _manager); + UtilMorph.disguise(player, disguisePlayer, Manager); player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, Integer.MAX_VALUE, 1, true, false)); } @@ -82,7 +82,7 @@ public class MorphMetalMan extends MorphGadget { removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); if (_playerColors.containsKey(player.getUniqueId())) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java index 974e068cc..d45504531 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPig.java @@ -53,14 +53,14 @@ public class MorphPig extends MorphGadget this.applyArmor(player, message); DisguisePig disguise = new DisguisePig(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler @@ -84,9 +84,9 @@ public class MorphPig extends MorphGadget @EventHandler public void HeroOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ULTRA)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ULTRA)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } @@ -136,7 +136,7 @@ public class MorphPig extends MorphGadget if (UtilMath.offset(player, other) > range) continue; - if (_manager.collideEvent(player, this, other)) + if (Manager.collideEvent(player, this, other)) continue; //Cooldown diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java index 96e89e3f2..cb13b4ff5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphPumpkinKing.java @@ -67,7 +67,7 @@ public class MorphPumpkinKing extends MorphGadget DisguiseSkeleton disguise = new DisguiseSkeleton(player); disguise.showArmor(); disguise.SetSkeletonType(SkeletonType.WITHER); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); player.getInventory().setHelmet(new ItemStack(Material.JACK_O_LANTERN)); @@ -79,7 +79,7 @@ public class MorphPumpkinKing extends MorphGadget public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.getInventory().setHelmet(null); } @@ -106,7 +106,7 @@ public class MorphPumpkinKing extends MorphGadget { for (Player player : getActive()) { - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { continue; } @@ -140,7 +140,7 @@ public class MorphPumpkinKing extends MorphGadget _ent = spawnLocation.getWorld().dropItem(spawnLocation, new ItemBuilder(Material.APPLE).setTitle(new Random().nextDouble() + "").build()); _ent.setPickupDelay(Integer.MAX_VALUE); _disguise = new DisguiseBlock(_ent, Material.JACK_O_LANTERN.getId(), 0); - _manager.getDisguiseManager().disguise(_disguise); + Manager.getDisguiseManager().disguise(_disguise); _detonation = System.currentTimeMillis() + 7000; _done = false; } @@ -157,7 +157,7 @@ public class MorphPumpkinKing extends MorphGadget Map players = UtilPlayer.getInRadius(_ent.getLocation(), 8); for (Player player : players.keySet()) { - if (_manager.collideEvent(_user, MorphPumpkinKing.this, player)) + if (Manager.collideEvent(_user, MorphPumpkinKing.this, player)) continue; double mult = players.get(player); @@ -165,7 +165,7 @@ public class MorphPumpkinKing extends MorphGadget //Knockback UtilAction.velocity(player, UtilAlg.getTrajectory(_ent.getLocation(), player.getLocation()), 1 * mult, false, 0, 0.5 + 0.5 * mult, 10, true); } - _manager.getDisguiseManager().undisguise(_disguise); + Manager.getDisguiseManager().undisguise(_disguise); _ent.remove(); _done = true; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java index 36d6eafe3..7c857694b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSanta.java @@ -67,7 +67,7 @@ public class MorphSanta extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, profile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, _manager); + UtilMorph.disguise(player, disguisePlayer, Manager); } @Override @@ -75,7 +75,7 @@ public class MorphSanta extends MorphGadget { removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler @@ -103,7 +103,7 @@ public class MorphSanta extends MorphGadget { int shards = UtilMath.rRange(250, 500); - if (_manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < shards + SHARD_CHARGE) + if (Manager.getDonationManager().Get(player).getBalance(GlobalCurrency.TREASURE_SHARD) < shards + SHARD_CHARGE) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Shards.")); return; @@ -116,7 +116,7 @@ public class MorphSanta extends MorphGadget SkinData.PRESENT.getSkull("Hidden Present " + System.currentTimeMillis(), new ArrayList<>())); UtilAction.velocity(present, player.getLocation().getDirection(), 0.2, false, 0, 0.2, 1, false); - _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Present Hide", -(shards + SHARD_CHARGE)); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, player, this.getName() + " Present Hide", -(shards + SHARD_CHARGE)); present.setPickupDelay(40); @@ -189,7 +189,7 @@ public class MorphSanta extends MorphGadget if (santaPresent.getPresentType().equals(SantaPresent.PresentType.PRESENT)) { - _manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Present Pickup", santaPresent.getAmmo()); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.TREASURE_SHARD, event.getPlayer(), getName() + " Present Pickup", santaPresent.getAmmo()); //Announce Bukkit.broadcastMessage(C.cGold + C.Bold + event.getPlayer().getName() + @@ -200,7 +200,7 @@ public class MorphSanta extends MorphGadget else if (santaPresent.getPresentType().equals(SantaPresent.PresentType.COAL)) { // Gives coals - _manager.getInventoryManager().addItemToInventory(event.getPlayer(), "Coal", santaPresent.getAmmo()); + Manager.getInventoryManager().addItemToInventory(event.getPlayer(), "Coal", santaPresent.getAmmo()); //Announce Bukkit.broadcastMessage(C.cGold + C.Bold + event.getPlayer().getName() + diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java index 492b89837..925934a72 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSlime.java @@ -60,14 +60,14 @@ public class MorphSlime extends MorphGadget disguise.SetSize(size); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java index 2f429b00b..25326feff 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSnowman.java @@ -60,14 +60,14 @@ public class MorphSnowman extends MorphGadget this.applyArmor(player, message); DisguiseSnowman disguise = new DisguiseSnowman(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler @@ -141,7 +141,7 @@ public class MorphSnowman extends MorphGadget if (!_snowball.containsKey(proj)) return; - if(_manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) return; + if(Manager.collideEvent(_snowball.remove(proj), this, event.getEntity())) return; UtilAction.velocity(event.getEntity(), proj.getVelocity().multiply(0.15).add(new Vector(0, 0.15, 0))); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java index 6e16287d2..096f453fd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphSquid.java @@ -54,7 +54,7 @@ public class MorphSquid extends MorphGadget implements IThrown { applyArmor(player, message); DisguiseSquid disguiseSquid = new DisguiseSquid(player); - UtilMorph.disguise(player, disguiseSquid, _manager); + UtilMorph.disguise(player, disguiseSquid, Manager); onToggleSwim(new PlayerToggleSwimEvent(player, SwimManager.isSwimming(player.getUniqueId()), SwimManager.isInLava(player.getUniqueId()))); } @@ -62,7 +62,7 @@ public class MorphSquid extends MorphGadget implements IThrown public void disableCustom(Player player, boolean message) { removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler @@ -89,7 +89,7 @@ public class MorphSquid extends MorphGadget implements IThrown if (event.isSwimming()) { // Removes any costume player could be wearing - _manager.removeOutfit(event.getPlayer(), OutfitGadget.ArmorSlot.BOOTS); + Manager.removeOutfit(event.getPlayer(), OutfitGadget.ArmorSlot.BOOTS); // Adds enchanted boot ItemStack enchantedBoot = new ItemStack(Material.DIAMOND_BOOTS, 1); @@ -126,7 +126,7 @@ public class MorphSquid extends MorphGadget implements IThrown UtilAction.velocity(item, player.getLocation().getDirection(), 0.01, true, -0.3, 1.5, 10, false); - _manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, + Manager.getProjectileManager().AddThrow(item, player, this, -1, true, true, true, true, null, 1f, 1f, null, null, 0, UpdateType.TICK, 0.5f); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java index 457f864d8..8a6571d36 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphStray.java @@ -49,7 +49,7 @@ public class MorphStray extends MorphGadget // TODO CHECK IF LOBBY IS 1.9+ applyArmor(player, message); DisguiseSquid disguiseSquid = new DisguiseSquid(player); - UtilMorph.disguise(player, disguiseSquid, _manager); + UtilMorph.disguise(player, disguiseSquid, Manager); // Gives bow and arrow ItemStack bow = ItemStackFactory.Instance.CreateStack(Material.BOW, (byte) 0, 1, C.cGreen + "Stray Bow", UtilText.splitLinesToArray(new String[]{"Placeholder"}, LineFormat.LORE)); @@ -61,7 +61,7 @@ public class MorphStray extends MorphGadget public void disableCustom(Player player, boolean message) { removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); // Removes bow and arrow player.getInventory().setItem(2, new ItemStack(Material.AIR)); @@ -84,7 +84,7 @@ public class MorphStray extends MorphGadget _strayArrows.add((Arrow) event.getProjectile()); - Bukkit.getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() { @Override public void run() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java index 31dd8d69b..24cd35247 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTitan.java @@ -65,14 +65,14 @@ public class MorphTitan extends MorphGadget DisguiseGuardian disguise = new DisguiseGuardian(player); disguise.setElder(true); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); @@ -96,7 +96,7 @@ public class MorphTitan extends MorphGadget if (!Recharge.Instance.use(player, "Guardians Laser", 6000, true, false, "Cosmetics")) return; - DisguiseBase base = _manager.getDisguiseManager().getDisguise(player); + DisguiseBase base = Manager.getDisguiseManager().getDisguise(player); if (base == null || !(base instanceof DisguiseGuardian)) return; @@ -130,7 +130,7 @@ public class MorphTitan extends MorphGadget disguise.setTarget(stand.getEntityId()); - _manager.getDisguiseManager().updateDisguise(disguise); + Manager.getDisguiseManager().updateDisguise(disguise); //Fake Head UtilEnt.setFakeHead(player, true); @@ -154,7 +154,7 @@ public class MorphTitan extends MorphGadget for (Player ent : players.keySet()) { if (ent instanceof Player) - if (_manager.collideEvent(event.GetPlayer(), this, (Player)ent)) + if (Manager.collideEvent(event.GetPlayer(), this, (Player)ent)) continue; double mult = players.get(ent); @@ -170,14 +170,14 @@ public class MorphTitan extends MorphGadget } //Disguise - DisguiseBase base = _manager.getDisguiseManager().getDisguise(event.GetPlayer()); + DisguiseBase base = Manager.getDisguiseManager().getDisguise(event.GetPlayer()); if (base == null || !(base instanceof DisguiseGuardian)) return; DisguiseGuardian disguise = (DisguiseGuardian)base; disguise.setTarget(0); - _manager.getDisguiseManager().updateDisguise(disguise); + Manager.getDisguiseManager().updateDisguise(disguise); } } @@ -225,9 +225,9 @@ public class MorphTitan extends MorphGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java index 0f628fca6..6fc6a2f90 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphTurkey.java @@ -46,14 +46,14 @@ public class MorphTurkey extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, profile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, _manager); + UtilMorph.disguise(player, disguisePlayer, Manager); } @Override public void disableCustom(Player player, boolean message) { removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java index 99e6d0eee..55ea3a9ba 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphUncleSam.java @@ -49,7 +49,7 @@ public class MorphUncleSam extends MorphGadget DisguisePlayer disguisePlayer = new DisguisePlayer(player, profile); disguisePlayer.showInTabList(true, 0); - UtilMorph.disguise(player, disguisePlayer, _manager); + UtilMorph.disguise(player, disguisePlayer, Manager); } @Override @@ -57,7 +57,7 @@ public class MorphUncleSam extends MorphGadget { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java index 2e1fac522..729c115b0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java @@ -60,14 +60,14 @@ public class MorphVillager extends MorphGadget implements IThrown this.applyArmor(player, message); DisguiseVillager disguise = new DisguiseVillager(player); - UtilMorph.disguise(player, disguise, _manager); + UtilMorph.disguise(player, disguise, Manager); } @Override public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } @EventHandler @@ -81,7 +81,7 @@ public class MorphVillager extends MorphGadget implements IThrown if (!UtilEvent.isAction(event, ActionType.L)) return; - if (_manager.getDonationManager().Get(player).getBalance(GlobalCurrency.GEM) < 20) + if (Manager.getDonationManager().Get(player).getBalance(GlobalCurrency.GEM) < 20) { UtilPlayer.message(player, F.main("Gadget", "You do not have enough Gems.")); return; @@ -97,10 +97,10 @@ public class MorphVillager extends MorphGadget implements IThrown UtilAction.velocity(gem, player.getLocation().getDirection(), 1, false, 0, 0.2, 1, false); //Throw - _manager.getProjectileManager().AddThrow(gem, player, this, -1, true, true, true, true, + Manager.getProjectileManager().AddThrow(gem, player, this, -1, true, true, true, true, null, 1.4f, 0.8f, null, null, 0, UpdateType.TICK, 0.5f); - _manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, player, this.getName() + " Throw", -20); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, player, this.getName() + " Throw", -20); gem.setPickupDelay(40); @@ -114,7 +114,7 @@ public class MorphVillager extends MorphGadget implements IThrown return; if (target instanceof Player) - if (_manager.collideEvent((Player) data.getThrower(), this, (Player) target)) + if (Manager.collideEvent((Player) data.getThrower(), this, (Player) target)) return; //Pull @@ -150,7 +150,7 @@ public class MorphVillager extends MorphGadget implements IThrown event.setCancelled(true); event.getItem().remove(); - _manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, event.getPlayer(), getName() + " Pickup", 16); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, event.getPlayer(), getName() + " Pickup", 16); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1f, 2f); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java index 0ff6b9b7a..d394b3e87 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWitch.java @@ -42,7 +42,7 @@ public class MorphWitch extends MorphGadget { this.applyArmor(player, message); DisguiseWitch disguiseWitch = new DisguiseWitch(player); - UtilMorph.disguise(player, disguiseWitch, _manager); + UtilMorph.disguise(player, disguiseWitch, Manager); } @Override @@ -54,7 +54,7 @@ public class MorphWitch extends MorphGadget { witchEffectManager.stop(); } - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); } public ItemStack getWitchItem() @@ -100,14 +100,14 @@ public class MorphWitch extends MorphGadget } // Checks if player is opening a treasure chest/close to a treasure area - if (_manager.getTreasureManager() != null) + if (Manager.getTreasureManager() != null) { - if (_manager.getTreasureManager().isOpening(event.getPlayer())) + if (Manager.getTreasureManager().isOpening(event.getPlayer())) { UtilPlayer.message(event.getPlayer(), F.main("Witch Morph", "You can't place the cauldron there!")); return; } - for (Location blockLocation : _manager.getTreasureManager().getBlockLocations()) + for (Location blockLocation : Manager.getTreasureManager().getBlockLocations()) { if (blockLocation.distanceSquared(cauldronLocation) <= 25) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java index 6f827539a..59f9bcb46 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java @@ -65,7 +65,7 @@ public class MorphWither extends MorphGadget player.setHealth(300); DisguiseWither disguise = new DisguiseWither(player); - UtilMorph.disguise(player, disguise, _manager, true); + UtilMorph.disguise(player, disguise, Manager, true); player.setMaxHealth(20); player.setHealth(20); @@ -75,7 +75,7 @@ public class MorphWither extends MorphGadget public void disableCustom(Player player, boolean message) { this.removeArmor(player); - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); player.setAllowFlight(false); player.setFlying(false); @@ -127,7 +127,7 @@ public class MorphWither extends MorphGadget HashMap players = UtilPlayer.getInRadius(event.getLocation(), 6); for (Player player : players.keySet()) { - if (_manager.collideEvent((Player) skull.getShooter(), this, player)) + if (Manager.collideEvent((Player) skull.getShooter(), this, player)) continue; double mult = players.get(player); @@ -181,9 +181,9 @@ public class MorphWither extends MorphGadget public void legendOwner(PlayerJoinEvent event) { // TODO HARDCODED Wither Morph Database Item Id - 550 - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) { - _manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(550, getName()), 1)); + Manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(550, getName()), 1)); } } @@ -195,7 +195,7 @@ public class MorphWither extends MorphGadget { Player player = activeIterator.next(); - DisguiseBase disguise = _manager.getDisguiseManager().getDisguise(player); + DisguiseBase disguise = Manager.getDisguiseManager().getDisguise(player); if (disguise == null || !(disguise instanceof DisguiseWither)) { @@ -206,7 +206,7 @@ public class MorphWither extends MorphGadget ((DisguiseWither)disguise).setName(text); ((DisguiseWither)disguise).setHealth((float) (healthPercent * 300)); - _manager.getDisguiseManager().updateDisguise(disguise); + Manager.getDisguiseManager().updateDisguise(disguise); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java index 3aa1734ea..bcda0800d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/OutfitTeam.java @@ -50,16 +50,16 @@ public class OutfitTeam extends OutfitGadget } enableCustom(player, true); - _manager.setActive(player, this); + Manager.setActive(player, this); Bukkit.getServer().getPluginManager().callEvent(new GadgetAppliedEvent(player, this)); } @Override public void applyArmor(Player player, boolean message) { - _manager.removeGadgetType(player, GadgetType.MORPH); + Manager.removeGadgetType(player, GadgetType.MORPH); - _manager.removeOutfit(player, _slot); + Manager.removeOutfit(player, _slot); _active.add(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java index 62cfc46fc..0cba46733 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/freezesuit/OutfitFreezeSuit.java @@ -130,13 +130,13 @@ public class OutfitFreezeSuit extends OutfitGadget for (Block block : blocks.keySet()) { - if (_manager.getTreasureManager() != null) + if (Manager.getTreasureManager() != null) { - if (_manager.getTreasureManager().isOpening(player)) + if (Manager.getTreasureManager().isOpening(player)) { forceBreak= true; } - for (Location blockLocation : _manager.getTreasureManager().getBlockLocations()) + for (Location blockLocation : Manager.getTreasureManager().getBlockLocations()) { if (blockLocation.distanceSquared(block.getLocation()) <= 25) { @@ -150,7 +150,7 @@ public class OutfitFreezeSuit extends OutfitGadget if (!setBlocks) continue; - _manager.getBlockRestore().snow(block, (byte) 1, (byte) 1, (int) (DURATION * (1 + blocks.get(block))), 250, 0); + Manager.getBlockRestore().snow(block, (byte) 1, (byte) 1, (int) (DURATION * (1 + blocks.get(block))), 250, 0); } } } @@ -180,7 +180,7 @@ public class OutfitFreezeSuit extends OutfitGadget else { block.getWorld().playEffect(block.getLocation(), Effect.STEP_SOUND, 79); - _manager.getBlockRestore().add(block, 79, (byte) 0, MELT_TIME); + Manager.getBlockRestore().add(block, 79, (byte) 0, MELT_TIME); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java index 4d919a826..8261df65c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleChristmasTree.java @@ -38,7 +38,7 @@ public class ParticleChristmasTree extends ParticleGadget { if (!_effects.containsKey(player.getUniqueId())) { - ChristmasTreeEffect christmasTreeEffect = new ChristmasTreeEffect(_manager.getPlugin(), player, _manager); + ChristmasTreeEffect christmasTreeEffect = new ChristmasTreeEffect(Manager.getPlugin(), player, Manager); christmasTreeEffect.start(); _effects.put(player.getUniqueId(), christmasTreeEffect); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java index 2c816f6f6..467db55d2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java @@ -33,7 +33,7 @@ public class ParticleCoalFumes extends ParticleGadget int amount = 5; ParticleType type = ParticleType.LARGE_SMOKE; - if(_manager.isMoving(player)) + if(Manager.isMoving(player)) { xz = 0.4f; amount = 2; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java index 86cbdf972..0a2298be6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFireRings.java @@ -31,7 +31,7 @@ public class ParticleFireRings extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.FLAME, player.getLocation().add(0, 1f, 0), 0.2f, 0.2f, 0.2f, 0, 1, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java index e6914496b..92239bdfd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleKronos.java @@ -47,16 +47,16 @@ public class ParticleKronos extends ParticleGadget if (!_glass.containsKey(player)) _glass.put(player, new ParticleKronosData(player)); - _glass.get(player).update(_manager.isMoving(player)); + _glass.get(player).update(Manager.isMoving(player)); } @EventHandler public void titanOwner(PlayerJoinEvent event) { - /*Until it becomes purchasable*/if (_manager.getClientManager().Get(event.getPlayer()).GetRank().equals(Rank.TITAN)) + /*Until it becomes purchasable*/if (Manager.getClientManager().Get(event.getPlayer()).GetRank().equals(Rank.TITAN)) //if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java index 12ead8eb2..f99338a75 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleLegend.java @@ -40,9 +40,9 @@ public class ParticleLegend extends ParticleGadget public void legendOwner(PlayerJoinEvent event) { // TODO HARDCODED Legendary Aura Database Item Id - 552 - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.LEGEND)) { - _manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(552, getName()), 1)); + Manager.getInventoryManager().Get(event.getPlayer()).addItem(new ClientItem(new Item(552, getName()), 1)); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java index 25fef8b4d..f781ff3c9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsAngel.java @@ -32,7 +32,7 @@ public class ParticleWingsAngel extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java index 089c0a121..ca1f4f584 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsDemons.java @@ -34,7 +34,7 @@ public class ParticleWingsDemons extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { if (event.getType() == UpdateType.FASTEST) UtilParticle.playParticleFor(player, ParticleType.SMOKE, loc, 0.3f, 0.2f, 0.3f, 0, 10, ViewDist.NORMAL); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java index 9e7f6694c..e5710f604 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsInfernal.java @@ -32,7 +32,7 @@ public class ParticleWingsInfernal extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java index 9776ddec0..3ad307040 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsLove.java @@ -38,7 +38,7 @@ public class ParticleWingsLove extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java index dcde0b02f..dd2003c9b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsPixie.java @@ -32,7 +32,7 @@ public class ParticleWingsPixie extends ParticleGadget { Location loc = player.getLocation().add(0, 1.2, 0).add(player.getLocation().getDirection().multiply(-0.2)); - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java index 5f13b1e3c..19cd7705c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleYinYang.java @@ -47,7 +47,7 @@ public class ParticleYinYang extends ParticleGadget RechargeData r = Recharge.Instance.Get(player).get("Yin and Yang Move"); - if(_manager.isMoving(player)) + if(Manager.isMoving(player)) { long time = 50; if(r != null) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java index a6e76fd63..4d8b223fc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/candycane/ParticleCandyCane.java @@ -35,7 +35,7 @@ public class ParticleCandyCane extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - boolean moving = _manager.isMoving(player); + boolean moving = Manager.isMoving(player); Location loc = player.getLocation(); float y = moving ? 0.2f : 0.15f; double yadd = getY(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java index 35fbfeb97..dea6a85aa 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/cupidslove/ParticleHeart.java @@ -33,7 +33,7 @@ public class ParticleHeart extends ParticleGadget { if (event.getType() != UpdateType.FASTEST) return; - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { if(getSet() == null || !getSet().isActive(player)) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java index 6fefeb799..417587dbb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/emerald/ParticleEmerald.java @@ -40,7 +40,7 @@ public class ParticleEmerald extends ParticleGadget if(getSet() == null || !getSet().isActive(player)) return; - if(_manager.isMoving(player)) + if(Manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.HAPPY_VILLAGER, player.getLocation().add(0, 0.2, 0), 0.3f, 0f, 0.3f, 0, 2, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java index 577d6a981..bafa31183 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/freedom/ParticleFreedom.java @@ -38,7 +38,7 @@ public class ParticleFreedom extends ParticleGadget @Override public void startEffect(Player player) { - _effects.put(player.getUniqueId(), new FreedomFireworkEffect(player, _manager.getPlugin(), true)); + _effects.put(player.getUniqueId(), new FreedomFireworkEffect(player, Manager.getPlugin(), true)); _effects.get(player.getUniqueId()).start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java index 4abe120c0..62c1388b3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/frostlord/ParticleFrostLord.java @@ -30,7 +30,7 @@ public class ParticleFrostLord extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.SNOW_SHOVEL, player.getLocation().add(0, 1, 0), 0.2f, 0.2f, 0.2f, 0, 4, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java index 8d72f79ca..f2c45007c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/howlingwinds/ParticleRain.java @@ -35,7 +35,7 @@ public class ParticleRain extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { UtilParticle.playParticleFor(player, ParticleType.SPLASH, player.getLocation(), 0.2f, 0, 0.2f, 0, 6, ViewDist.NORMAL); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java index 59332a626..04874fffc 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/music/ParticleMusic.java @@ -29,7 +29,7 @@ public class ParticleMusic extends ParticleGadget @Override public void playParticle(Player player, UpdateEvent event) { - boolean moving = _manager.isMoving(player); + boolean moving = Manager.isMoving(player); UpdateType type = moving? UpdateType.FASTER : UpdateType.FAST; if (event.getType() != type) return; @@ -76,7 +76,7 @@ public class ParticleMusic extends ParticleGadget if(red == 0) red = 0.00001; double step2 = Math.PI/12; - if(_manager.isMoving(player)) step2 = Math.PI/2; + if(Manager.isMoving(player)) step2 = Math.PI/2; for(double rad2 = 0; rad2 < Math.PI*2; rad2 += step2) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java index 27e62d969..3aab6f928 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/party/ParticlePartyTime.java @@ -57,7 +57,7 @@ public class ParticlePartyTime extends ParticleGadget for (int i = 0; i < 1; i++) { String particle = ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, list.get(i)); - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { UtilParticle.playParticleFor(player, particle, player.getLocation().add(0, 1, 0), null, 0.08f, 1, ViewDist.NORMAL); } @@ -82,7 +82,7 @@ public class ParticlePartyTime extends ParticleGadget _hiddenDrops.computeIfAbsent(player, key -> new HashSet<>()).add(item); DisguiseArmorStand stand = new DisguiseArmorStand(item); stand.setInvisible(true); - _manager.getDisguiseManager().disguise(stand); + Manager.getDisguiseManager().disguise(stand); String particle = ParticleType.ICON_CRACK.getParticle(Material.INK_SACK, data); UtilParticle.playParticleFor(player, particle, spawnLoc, null, 0.08f, 30, ViewDist.NORMAL); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java index 8eae12cac..9c3b8be54 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/shadow/ParticleFoot.java @@ -4,8 +4,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -48,7 +50,7 @@ public class ParticleFoot extends ParticleGadget _foot = !_foot; - if (!_manager.isMoving(player)) return; + if (!Manager.isMoving(player)) return; if (!UtilEnt.isGrounded(player)) return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java index d8984e476..b5f02de23 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/titan/ParticleTitan.java @@ -49,7 +49,7 @@ public class ParticleTitan extends ParticleGadget double r = 3; boolean redstone = false; - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { UtilParticle.playParticleFor(player, ParticleType.FLAME, player.getLocation().add(0, 0.1, 0), 0.2f, 0.1f, 0.2f, 0.015f, 3, ViewDist.NORMAL); return; @@ -94,9 +94,9 @@ public class ParticleTitan extends ParticleGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.TITAN)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java index 849dbff1b..a33078067 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/vampire/ParticleBlood.java @@ -30,7 +30,7 @@ public class ParticleBlood extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { UtilParticle.playParticleFor(player, ParticleType.RED_DUST, player.getLocation().add(0, 1, 0), 0.2f, 0.2f, 0.2f, 0, 2, ViewDist.NORMAL); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java index dbda9f2c4..f8d734e74 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/wisdom/ParticleEnchant.java @@ -31,7 +31,7 @@ public class ParticleEnchant extends ParticleGadget { if (event.getType() != UpdateType.TICK) return; - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { UtilParticle.PlayParticle(ParticleType.ENCHANTMENT_TABLE, player.getLocation().add(0, 1, 0), 0.2f, 0.2f, 0.2f, 0, 4, ViewDist.NORMAL, UtilServer.getPlayers()); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java index 145144147..53e6a7793 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/EternalTaunt.java @@ -68,7 +68,7 @@ public class EternalTaunt extends TauntGadget Bukkit.broadcastMessage(F.main("Taunt", F.name(player.getName()) + " waited so long they turned to bones.")); DisguiseSkeleton disguiseSkeleton = new DisguiseSkeleton(player); - UtilMorph.disguise(player, disguiseSkeleton, _manager); + UtilMorph.disguise(player, disguiseSkeleton, Manager); } @Override @@ -113,7 +113,7 @@ public class EternalTaunt extends TauntGadget @Override public void onFinish(Player player) { - UtilMorph.undisguise(player, _manager.getDisguiseManager()); + UtilMorph.undisguise(player, Manager.getDisguiseManager()); if (_clocks.containsKey(player.getUniqueId())) { _clocks.get(player.getUniqueId()).forEach(c -> c.remove()); @@ -125,9 +125,9 @@ public class EternalTaunt extends TauntGadget @EventHandler public void titanOwner(PlayerJoinEvent event) { - if (_manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ETERNAL)) + if (Manager.getClientManager().Get(event.getPlayer()).GetRank().has(Rank.ETERNAL)) { - _manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); + Manager.getDonationManager().Get(event.getPlayer()).addOwnedUnknownSalesPackage(getName()); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java index 9628c38be..de81b6a1b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/RainbowTaunt.java @@ -48,7 +48,7 @@ public class RainbowTaunt extends TauntGadget Location start = player.getLocation().clone().add(sideA.multiply(4).toLocation(player.getWorld())); Location end = player.getLocation().clone().add(sideB.multiply(4).toLocation(player.getWorld())); - RainbowTauntEffect rainbowTauntEffect = new RainbowTauntEffect(start, _manager.getPlugin()); + RainbowTauntEffect rainbowTauntEffect = new RainbowTauntEffect(start, Manager.getPlugin()); rainbowTauntEffect.setTargetLocation(new EffectLocation(end)); rainbowTauntEffect.start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java index 2294fa0ed..d7d20aa75 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectBabyChicken.java @@ -125,7 +125,7 @@ public class WinEffectBabyChicken extends WinEffectGadget { _chicken.getWorld().playSound(_chicken.getLocation(), Sound.CHICKEN_IDLE, 1, (float) (1 + Math.random()*0.6)); - Hologram hologram = new Hologram(_manager.getHologramManager(), _chicken.getEyeLocation(), C.Italics + "BAWK"); + Hologram hologram = new Hologram(Manager.getHologramManager(), _chicken.getEyeLocation(), C.Italics + "BAWK"); _text.put(hologram, Vector.getRandom().subtract(Vector.getRandom()).normalize().multiply(0.4).setY(0.6)); hologram.start(); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java index a7e8199ed..18b3fb26d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFireworks.java @@ -45,7 +45,7 @@ public class WinEffectFireworks extends WinEffectGadget start.setDirection(new Vector(1, 0, 0)); _npc = getNPC(_player, start); - AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); for(double rad = 0; rad < Math.PI*2; rad+= Math.PI/points) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java index 03f56b951..8a0760799 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectFlames.java @@ -49,7 +49,7 @@ public class WinEffectFlames extends WinEffectGadget start.setDirection(new Vector(1, 0, 0)); _npc = getNPC(_player, start); - AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); for(double rad = 0; rad < Math.PI*2; rad+= Math.PI/points) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java index be41eb54d..d40136327 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java @@ -173,11 +173,11 @@ public class WinEffectHalloween extends WinEffectGadget BabyFireworkEffect babyFireworkEffect; if (i %2 == 0) { - babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, _manager.getPlugin(), color); + babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, Manager.getPlugin(), color); } else { - babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, _manager.getPlugin(), Color.ORANGE, Color.BLACK); + babyFireworkEffect = new BabyFireworkEffect((randomLoc) ? randLocation : entityLocation, Manager.getPlugin(), Color.ORANGE, Color.BLACK); } // Starts without the firework trail babyFireworkEffect.setCount(6); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java index 3edd2858b..e159d74bd 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLightningStrike.java @@ -29,7 +29,7 @@ public class WinEffectLightningStrike extends WinEffectGadget public void play() { final DisguisePlayer player = getNPC(this._player, getBaseLocation()); - Bukkit.getScheduler().runTaskLater(_manager.getPlugin(), + Bukkit.getScheduler().runTaskLater(Manager.getPlugin(), new Runnable() { public void run() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java index 3164313ba..9b31c73fa 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectLoveIsABattlefield.java @@ -50,7 +50,7 @@ public class WinEffectLoveIsABattlefield extends WinEffectGadget { _npc = getNPC(this._player, getBaseLocation()); - AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); animator.addPoint(new AnimationPoint(20, new Vector(0,0,0), new Vector(-1, 0.5, 0))); animator.addPoint(new AnimationPoint(40, new Vector(0,0,0), new Vector( 0, 0.5,-1))); @@ -103,7 +103,7 @@ public class WinEffectLoveIsABattlefield extends WinEffectGadget @Override public void finish() { - _manager.getDisguiseManager().undisguise(_npc); + Manager.getDisguiseManager().undisguise(_npc); _npc = null; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java index 90a17799b..3dc52ff95 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectPodium.java @@ -32,7 +32,7 @@ public class WinEffectPodium extends WinEffectGadget { _npc = getNPC(this._player, getBaseLocation()); - AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); animator.addPoint(new AnimationPoint( 20, new Vector(0,0,0), new Vector(-1, 0.5, 0))); animator.addPoint(new AnimationPoint( 40, new Vector(0,0,0), new Vector( 0, 0.5,-1))); @@ -78,7 +78,7 @@ public class WinEffectPodium extends WinEffectGadget @Override public void finish() { - _manager.getDisguiseManager().undisguise(_npc); + Manager.getDisguiseManager().undisguise(_npc); _npc = null; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java index 2304574df..6539f59c0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectRiseOfTheElderGuardian.java @@ -62,7 +62,7 @@ public class WinEffectRiseOfTheElderGuardian extends WinEffectGadget stand.setGravity(false); DisguiseGuardian g = new DisguiseGuardian(stand); - _manager.getDisguiseManager().disguise(g); + Manager.getDisguiseManager().disguise(g); _guardians.add(g); } @@ -91,7 +91,7 @@ public class WinEffectRiseOfTheElderGuardian extends WinEffectGadget for(DisguiseGuardian g : _guardians) { g.setTarget(_npcPlayer.getEntityId()); - _manager.getDisguiseManager().updateDisguise(g); + Manager.getDisguiseManager().updateDisguise(g); } } @@ -113,17 +113,17 @@ public class WinEffectRiseOfTheElderGuardian extends WinEffectGadget for(DisguiseGuardian g : _guardians) { g.setTarget(0); - _manager.getDisguiseManager().updateDisguise(g); + Manager.getDisguiseManager().updateDisguise(g); } ArmorStand stand = (ArmorStand) _npcPlayer.getEntity().getBukkitEntity(); - _manager.getDisguiseManager().undisguise(stand); + Manager.getDisguiseManager().undisguise(stand); _npcGuardian = new DisguiseGuardian(stand); _npcGuardian.setElder(true); - _manager.getDisguiseManager().disguise(_npcGuardian); + Manager.getDisguiseManager().disguise(_npcGuardian); } _tick++; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java index f0edca603..42a8c5115 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectSnowTrails.java @@ -48,7 +48,7 @@ public class WinEffectSnowTrails extends WinEffectGadget start.setDirection(new Vector(1, 0, 0)); _npc = getNPC(_player, start); - AnimatorEntity animator = new AnimatorEntity(_manager.getPlugin(), _npc.getEntity().getBukkitEntity()); + AnimatorEntity animator = new AnimatorEntity(Manager.getPlugin(), _npc.getEntity().getBukkitEntity()); for(double rad = 0; rad < Math.PI*2; rad+= Math.PI/points) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java index bf9ef4fcd..67a9abe9c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectWinterWarfare.java @@ -76,7 +76,7 @@ public class WinEffectWinterWarfare extends WinEffectGadget @Override public void finish() { - _manager.getDisguiseManager().undisguise(_npc); + Manager.getDisguiseManager().undisguise(_npc); _npc = null; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java index 735047344..4d3b5b0d4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ArrowEffectGadget.java @@ -29,7 +29,7 @@ public abstract class ArrowEffectGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (_manager.hideParticles()) + if (Manager.hideParticles()) return false; return true; @@ -38,7 +38,7 @@ public abstract class ArrowEffectGadget extends Gadget @EventHandler public void arrowLaunch(ProjectileLaunchEvent event) { - if (_manager.hideParticles()) + if (Manager.hideParticles()) return; if (event.getEntity() instanceof Arrow) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java index 3d97ba38f..4a5ad6f60 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java @@ -49,7 +49,7 @@ public abstract class BalloonGadget extends Gadget } else { - _manager.removeActive(player, this); + Manager.removeActive(player, this); UtilPlayer.message(player, F.main("Gadget", "You cannot have more than " + F.count("10") + " balloons!")); } } @@ -152,7 +152,7 @@ public abstract class BalloonGadget extends Gadget if (event.getFrom().getY() > 0) return; - for (BalloonGadget balloonGadget : _manager.getActiveBalloons(event.getPlayer())) + for (BalloonGadget balloonGadget : Manager.getActiveBalloons(event.getPlayer())) { balloonGadget.disable(event.getPlayer(), false); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java index 7aafae5a6..35eeb4737 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DeathEffectGadget.java @@ -20,7 +20,7 @@ public abstract class DeathEffectGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (_manager.hideParticles()) + if (Manager.hideParticles()) return false; return true; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java index 6d2ffbb37..e1076dba7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/DoubleJumpEffectGadget.java @@ -20,7 +20,7 @@ public abstract class DoubleJumpEffectGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (_manager.hideParticles()) + if (Manager.hideParticles()) return false; return true; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java index b165ed3ff..141885d0c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/Gadget.java @@ -22,16 +22,20 @@ import mineplex.core.shop.item.SalesPackageBase; public abstract class Gadget extends SalesPackageBase implements Listener { - public GadgetManager _manager; + public GadgetManager Manager; private GadgetType _gadgetType; protected HashSet _active = new HashSet<>(); + protected GadgetSet _set = null; private String[] _alternativePackageNames; - private boolean _freeGadget; + + private boolean _free; + private YearMonth _yearMonth = null; + private ItemStack _displayItem = null; public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data) @@ -49,15 +53,15 @@ public abstract class Gadget extends SalesPackageBase implements Listener super(name, mat, data, desc, cost, quantity); _gadgetType = gadgetType; - _knownPackage = false; - _freeGadget = false; + KnownPackage = false; + _free = false; _alternativePackageNames = alternativesalepackageNames; if(_alternativePackageNames == null) { _alternativePackageNames = new String[0]; } - _manager = manager; + Manager = manager; - _manager.getPlugin().getServer().getPluginManager().registerEvents(this, _manager.getPlugin()); + Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin()); } public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data, YearMonth yearMonth, int quantity, String... alternativesalepackageNames) @@ -65,32 +69,32 @@ public abstract class Gadget extends SalesPackageBase implements Listener super(name, mat, data, desc, cost, quantity); _gadgetType = gadgetType; - _knownPackage = false; - _freeGadget = false; + KnownPackage = false; + _free = false; _yearMonth = yearMonth; _alternativePackageNames = alternativesalepackageNames; if(_alternativePackageNames == null) { _alternativePackageNames = new String[0]; } - _manager = manager; + Manager = manager; - _manager.getPlugin().getServer().getPluginManager().registerEvents(this, _manager.getPlugin()); + Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin()); } - public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data, int quantity, boolean freeGadget, String... alternativesalepackageNames) + public Gadget(GadgetManager manager, GadgetType gadgetType, String name, String[] desc, int cost, Material mat, byte data, int quantity, boolean free, String... alternativesalepackageNames) { super(name, mat, data, desc, cost, quantity); _gadgetType = gadgetType; - _knownPackage = false; - _freeGadget = freeGadget; + KnownPackage = false; + _free = free; _alternativePackageNames = alternativesalepackageNames; if(_alternativePackageNames == null) { _alternativePackageNames = new String[0]; } - _manager = manager; + Manager = manager; - _manager.getPlugin().getServer().getPluginManager().registerEvents(this, _manager.getPlugin()); + Manager.getPlugin().getServer().getPluginManager().registerEvents(this, Manager.getPlugin()); } public GadgetType getGadgetType() @@ -137,7 +141,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener return; } - _manager.setActive(player, this); + Manager.setActive(player, this); enableCustom(player, message); Bukkit.getServer().getPluginManager().callEvent(new GadgetAppliedEvent(player, this)); } @@ -157,7 +161,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener { if (isActive(player)) { - _manager.removeActive(player, this); + Manager.removeActive(player, this); GadgetDisableEvent event = new GadgetDisableEvent(player, this); Bukkit.getServer().getPluginManager().callEvent(event); disableCustom(player, message); @@ -166,7 +170,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener public void enableCustom(Player player, boolean message) { - _manager.removeGadgetType(player, _gadgetType, this); + Manager.removeGadgetType(player, _gadgetType, this); _active.add(player); if (message) UtilPlayer.message(player, F.main("Gadget", "You enabled " + F.elem(getName()) + ".")); @@ -180,14 +184,14 @@ public abstract class Gadget extends SalesPackageBase implements Listener public boolean ownsGadget(Player player) { - if(isFree() || _freeGadget) { return true; } - if(_manager.getDonationManager().Get(player).ownsUnknownSalesPackage(getName())) { return true; } - if(_manager.getInventoryManager().Get(player).getItemCount(getName()) > 0) { return true; } + if(isFree() || _free) { return true; } + if(Manager.getDonationManager().Get(player).ownsUnknownSalesPackage(getName())) { return true; } + if(Manager.getInventoryManager().Get(player).getItemCount(getName()) > 0) { return true; } for(String alt : _alternativePackageNames) { - if(_manager.getDonationManager().Get(player).ownsUnknownSalesPackage(alt)) { return true; } - if(_manager.getInventoryManager().Get(player).getItemCount(alt) > 0) { return true; } + if(Manager.getDonationManager().Get(player).ownsUnknownSalesPackage(alt)) { return true; } + if(Manager.getInventoryManager().Get(player).getItemCount(alt) > 0) { return true; } } return false; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java index 7684c5f5d..b6becadc1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java @@ -46,9 +46,9 @@ public abstract class HatGadget extends OutfitGadget public void applyArmor(Player player, boolean message) { - _manager.removeGadgetType(player, GadgetType.MORPH, this); + Manager.removeGadgetType(player, GadgetType.MORPH, this); - _manager.removeOutfit(player, _slot); + Manager.removeOutfit(player, _slot); _active.add(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java index 693bafc8f..82a685892 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ItemGadget.java @@ -1,6 +1,5 @@ package mineplex.core.gadget.types; -import java.time.YearMonth; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -41,17 +40,7 @@ public abstract class ItemGadget extends Gadget _ammo = ammo; _recharge = recharge; - this._free = true; - } - - public ItemGadget(GadgetManager manager, String name, String[] desc, int cost, Material mat, byte data, - long recharge, Ammo ammo, YearMonth yearMonth) - { - super(manager, GadgetType.ITEM, name, desc, cost, mat, data, yearMonth); - - _ammo = ammo; - _recharge = recharge; - this._free = true; + Free = true; } public ItemGadget(GadgetManager manager, String name, String[] desc, int cost, Material mat, byte data, @@ -86,16 +75,16 @@ public abstract class ItemGadget extends Gadget public void ApplyItem(Player player, boolean inform) { - _manager.removeGadgetType(player, GadgetType.ITEM, this); + Manager.removeGadgetType(player, GadgetType.ITEM, this); _active.add(player); List itemLore = new ArrayList(); itemLore.addAll(Arrays.asList(getDescription())); itemLore.add(C.cBlack); - itemLore.add(C.cWhite + "Your Ammo : " + _manager.getInventoryManager().Get(player).getItemCount(getName())); + itemLore.add(C.cWhite + "Your Ammo : " + Manager.getInventoryManager().Get(player).getItemCount(getName())); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); if (inform) UtilPlayer.message(player, F.main("Gadget", "You equipped " + F.elem(getName()) + ".")); @@ -111,14 +100,14 @@ public abstract class ItemGadget extends Gadget final Player player = event.getPlayer(); - Bukkit.getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() { public void run() { if (player.isOnline()) { player.getInventory().remove(getDisplayMaterial()); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); UtilInv.Update(player); } } @@ -130,7 +119,7 @@ public abstract class ItemGadget extends Gadget { if (_active.remove(player)) { - player.getInventory().setItem(_manager.getActiveItemSlot(), null); + player.getInventory().setItem(Manager.getActiveItemSlot(), null); if (message) UtilPlayer.message(player, F.main("Gadget", "You unequipped " + F.elem(getName()) + ".")); @@ -167,7 +156,7 @@ public abstract class ItemGadget extends Gadget event.setCancelled(true); //Stock - if (!hasAmmo(player) && !_ammo.isFree()) + if (!hasAmmo(player)) { UtilPlayer.message(player, F.main("Gadget", "You do not have any " + getName() + " left.")); @@ -194,17 +183,16 @@ public abstract class ItemGadget extends Gadget return; } - if (!_ammo.isFree()) - _manager.getInventoryManager().addItemToInventory(player, getName(), -1); + Manager.getInventoryManager().addItemToInventory(player, getName(), -1); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); ActivateCustom(event.getPlayer()); } public boolean hasAmmo(Player player) { - return _manager.getInventoryManager().Get(player).getItemCount(getName()) > 0; + return Manager.getInventoryManager().Get(player).getItemCount(getName()) > 0; } public abstract void ActivateCustom(Player player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java index f681fe3bd..ff08e8152 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java @@ -25,7 +25,7 @@ public abstract class MorphGadget extends Gadget public void applyArmor(Player player, boolean message) { - _manager.removeGadgetType(player, GadgetType.MORPH, this); + Manager.removeGadgetType(player, GadgetType.MORPH, this); _active.add(player); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java index 5f8df9f09..708e5e5a6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MusicGadget.java @@ -51,7 +51,7 @@ public class MusicGadget extends Gadget return; } - if (!_manager.canPlaySongAt(player.getLocation())) + if (!Manager.canPlaySongAt(player.getLocation())) { UtilPlayer.message(player, F.main("Music", "There is already a song playing.")); return; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java index 2ddae9ad4..6ce4d70b7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java @@ -59,9 +59,9 @@ public abstract class OutfitGadget extends Gadget public void applyArmor(Player player, boolean message) { - _manager.removeGadgetType(player, GadgetType.MORPH, this); + Manager.removeGadgetType(player, GadgetType.MORPH, this); - _manager.removeOutfit(player, _slot); + Manager.removeOutfit(player, _slot); _active.add(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 254b33003..01d6e22a8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/ParticleGadget.java @@ -40,7 +40,7 @@ public abstract class ParticleGadget extends Gadget @Override public void enableCustom(Player player, boolean message) { - _manager.removeGadgetType(player, GadgetType.PARTICLE, this); + Manager.removeGadgetType(player, GadgetType.PARTICLE, this); _active.add(player); startEffect(player); if (message) @@ -62,7 +62,7 @@ public abstract class ParticleGadget extends Gadget if (UtilPlayer.isSpectator(player)) return false; - if (_manager.hideParticles()) + if (Manager.hideParticles()) return false; return true; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java index 8d971d301..06d6d9475 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java @@ -124,7 +124,7 @@ public abstract class WinEffectGadget extends Gadget // Loads gadgets back when players are teleported to the arcade hub, after the win effect for (Player player : UtilServer.getPlayers()) { - _manager.getUserGadgetPersistence().load(player); + Manager.getUserGadgetPersistence().load(player); } } } @@ -311,7 +311,7 @@ public abstract class WinEffectGadget extends Gadget profile.getProperties().putAll(((CraftPlayer) player).getHandle().getProfile().getProperties()); DisguisePlayer disguise = new DisguisePlayer(stand, profile); - _manager.getDisguiseManager().disguise(disguise); + Manager.getDisguiseManager().disguise(disguise); return disguise; } @@ -335,7 +335,7 @@ public abstract class WinEffectGadget extends Gadget profile.getProperties().put("textures", skinData.getProperty()); DisguisePlayer disguise = new DisguisePlayer(stand, profile); - _manager.getDisguiseManager().disguise(disguise); + Manager.getDisguiseManager().disguise(disguise); return disguise; } @@ -466,7 +466,7 @@ public abstract class WinEffectGadget extends Gadget */ protected String getRank(Player player) { - return _manager.getClientManager().Get(player).getRealOrDisguisedRank().getTag(true, true) + " " + C.Reset; + return Manager.getClientManager().Get(player).getRealOrDisguisedRank().getTag(true, true) + " " + C.Reset; } public int getGameTime() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java index 3ab15c9f8..242e21dfa 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java @@ -12,7 +12,7 @@ public class DragonMount extends Mount { super (manager, name, displayMaterial, displayData, desc, cost); - _knownPackage = false; + KnownPackage = false; } @Override diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java index edb368243..f383958b4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java @@ -36,7 +36,7 @@ public class HorseMount extends Mount> public HorseMount(MountManager manager, String name, String[] desc, Material displayMaterial, byte displayData, int cost, Color color, Style style, Variant variant, double jump, Material armor) { super (manager, name, displayMaterial, displayData, desc, cost); - _knownPackage = false; + KnownPackage = false; _color = color; _style = style; @@ -48,7 +48,7 @@ public class HorseMount extends Mount> public HorseMount(MountManager manager, String name, String[] desc, Material displayMaterial, byte displayData, int cost, Color color, Style style, Variant variant, double jump, Material armor, YearMonth yearMonth) { super (manager, name, displayMaterial, displayData, desc, cost, yearMonth); - _knownPackage = false; + KnownPackage = false; _color = color; _style = style; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java index d9c605cc3..a1f9f5a5b 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java @@ -33,7 +33,7 @@ public class MountCart extends Mount> UtilText.splitLineToArray(C.cGray + "Cruise around town in your shiny new Minecart RX Turbo!", LineFormat.LORE), 15000); - _knownPackage = false; + KnownPackage = false; } public void enableCustom(Player player) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java index 8bcc250ef..265601406 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java @@ -34,7 +34,7 @@ public class MountSlime extends Mount> UtilText.splitLineToArray(C.cGray + "Bounce around on your very own slime friend!", LineFormat.LORE), 15000); - _knownPackage = false; + KnownPackage = false; } public void enableCustom(Player player) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java index e49e1e453..066521459 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java @@ -23,7 +23,7 @@ public class BlowAKissEffect extends Effect public BlowAKissEffect(Player player, Location target, Gadget gadget) { - super(-1, new EffectLocation(player), gadget._manager.getPlugin()); + super(-1, new EffectLocation(player), gadget.Manager.getPlugin()); _gadget = gadget; _player = player; setTargetLocation(new EffectLocation(target)); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java index 718816efc..85c293e6f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/LoveDoctorEffect.java @@ -28,7 +28,7 @@ public class LoveDoctorEffect extends Effect public LoveDoctorEffect(Player player, Location target, Gadget gadget) { - super(-1, new EffectLocation(player), gadget._manager.getPlugin()); + super(-1, new EffectLocation(player), gadget.Manager.getPlugin()); _gadget = gadget; _player = player; setTargetLocation(new EffectLocation(target)); @@ -79,7 +79,7 @@ public class LoveDoctorEffect extends Effect HashMap players = UtilPlayer.getInRadius(loc, 9d); for (Player ent : players.keySet()) { - if (_gadget._manager.collideEvent(_player, _gadget, ent)) + if (_gadget.Manager.collideEvent(_player, _gadget, ent)) continue; double mult = players.get(ent); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java index abb66a52c..d9382e15e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/particleeffects/MetalManEffect.java @@ -34,7 +34,7 @@ public class MetalManEffect extends Effect public MetalManEffect(Location location, Location target, int color, Gadget gadget, Player player) { - super(-1, new EffectLocation(player), gadget._manager.getPlugin()); + super(-1, new EffectLocation(player), gadget.Manager.getPlugin()); _color = color; _gadget = gadget; _player = player; @@ -105,7 +105,7 @@ public class MetalManEffect extends Effect HashMap players = UtilPlayer.getInRadius(loc, 9d); for (Player ent : players.keySet()) { - if (_gadget._manager.collideEvent(_player, _gadget, ent)) + if (_gadget.Manager.collideEvent(_player, _gadget, ent)) continue; double mult = players.get(ent); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java index 91cd9e9d4..206e64a8f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetExtraSalesPackage.java @@ -11,9 +11,9 @@ public class PetExtraSalesPackage extends SalesPackageBase public PetExtraSalesPackage(String name, Material material, int price) { super(name, material, (byte)0, new String[0]); - _currencyCostMap.put(GlobalCurrency.TREASURE_SHARD, price); + CurrencyCostMap.put(GlobalCurrency.TREASURE_SHARD, price); - _knownPackage = false; - _oneTimePurchaseOnly = false; + KnownPackage = false; + OneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java index 84c606bc5..2189e1469 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/sales/PetSalesPackage.java @@ -14,8 +14,8 @@ public class PetSalesPackage extends SalesPackageBase public PetSalesPackage(PetType type, String tagName) { super(type.getName(), Material.MONSTER_EGG, (byte)type.getEntityType().getTypeId(), new String[0]); - _currencyCostMap.put(GlobalCurrency.TREASURE_SHARD, type.getPrice()); - _knownPackage = false; + CurrencyCostMap.put(GlobalCurrency.TREASURE_SHARD, type.getPrice()); + KnownPackage = false; setDisplayName(C.cGreen + "Purchase " + tagName); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java index f17874141..9290244de 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/item/SalesPackageBase.java @@ -1,29 +1,28 @@ package mineplex.core.shop.item; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; - import mineplex.core.common.currency.GlobalCurrency; import mineplex.core.common.util.NautHashMap; import mineplex.core.donation.repository.GameSalesPackageToken; import mineplex.core.itemstack.ItemBuilder; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPackage { private Material _displayMaterial; private byte _displayData; - protected String _name; - protected String _displayName; - protected String[] _description; - protected int _quantity; + protected String Name; + protected String DisplayName; + protected String[] Description; + protected int Quantity; - protected int _salesPackageId; - protected boolean _free; - protected NautHashMap _currencyCostMap; - protected boolean _knownPackage = true; - protected boolean _oneTimePurchaseOnly = true; + protected int SalesPackageId; + protected boolean Free; + protected NautHashMap CurrencyCostMap; + protected boolean KnownPackage = true; + protected boolean OneTimePurchaseOnly = true; public SalesPackageBase(String name, Material material, String...description) { @@ -42,46 +41,46 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack public SalesPackageBase(String name, Material material, byte displayData, String[] description, int coins, int quantity) { - _currencyCostMap = new NautHashMap<>(); + CurrencyCostMap = new NautHashMap<>(); - _name = name; - _displayName = name; - _description = description; + Name = name; + DisplayName = name; + Description = description; _displayMaterial = material; _displayData = displayData; - _currencyCostMap.put(GlobalCurrency.TREASURE_SHARD, coins); - _quantity = quantity; + CurrencyCostMap.put(GlobalCurrency.TREASURE_SHARD, coins); + Quantity = quantity; } @Override public String getName() { - return _name; + return Name; } @Override public String[] getDescription() { - return _description; + return Description; } @Override public int getCost(GlobalCurrency currencyType) { - return _currencyCostMap.containsKey(currencyType) ? _currencyCostMap.get(currencyType) : 0; + return CurrencyCostMap.containsKey(currencyType) ? CurrencyCostMap.get(currencyType) : 0; } @Override public int getSalesPackageId() { - return _salesPackageId; + return SalesPackageId; } @Override public boolean isFree() { - return _free; + return Free; } @Override @@ -99,42 +98,42 @@ public abstract class SalesPackageBase implements ICurrencyPackage, IDisplayPack @Override public void update(GameSalesPackageToken token) { - _salesPackageId = token.GameSalesPackageId; - _free = token.Free; + SalesPackageId = token.GameSalesPackageId; + Free = token.Free; if (token.Gems > 0) { - _currencyCostMap.put(GlobalCurrency.GEM, token.Gems); + CurrencyCostMap.put(GlobalCurrency.GEM, token.Gems); } } public int getQuantity() { - return _quantity; + return Quantity; } public boolean isKnown() { - return _knownPackage; + return KnownPackage; } public boolean oneTimePurchase() { - return _oneTimePurchaseOnly; + return OneTimePurchaseOnly; } public String getDisplayName() { - return _displayName; + return DisplayName; } public void setDisplayName(String name) { - _displayName = name; + DisplayName = name; } public ItemStack buildIcon() { - return new ItemBuilder(_displayMaterial).setData(_displayData).setTitle(_displayName).addLore(_description).build(); + return new ItemBuilder(_displayMaterial).setData(_displayData).setTitle(DisplayName).addLore(Description).build(); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java index 198eb3098..bd4162932 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/ChestPackage.java @@ -9,7 +9,7 @@ public class ChestPackage extends SalesPackageBase { super(name, mat, (byte) 0, new String[] {}, cost); - _knownPackage = false; - _oneTimePurchaseOnly = false; + KnownPackage = false; + OneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java index bdf9748cc..30ef863f6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureKey.java @@ -13,7 +13,7 @@ public class TreasureKey extends SalesPackageBase { super("Treasure Key", Material.TRIPWIRE_HOOK, (byte) 0, new String[] { ChatColor.RESET + "Used to open Treasure Chests" }, 1000); - _knownPackage = false; - _oneTimePurchaseOnly = false; + KnownPackage = false; + OneTimePurchaseOnly = false; } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java index 0568d831c..bc31e43e6 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/SelectBullsChargeGoal.java @@ -17,7 +17,7 @@ public class SelectBullsChargeGoal extends ObjectiveGoal { public SelectBullsChargeGoal(ClassesObjective objective) { - super(objective, "Open Class Manager", "Using the Class _manager, choose Bulls Charge for your Axe Skill"); + super(objective, "Open Class Manager", "Using the Class Manager, choose Bulls Charge for your Axe Skill"); } @Override diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java index 56c0e01c3..55e32d4bf 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/TextManager.java @@ -65,7 +65,7 @@ public class TextManager extends MiniPlugin UtilBlockText.MakeText("CAPTURE THE FLAG", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); // UtilBlockText.MakeText("CLANS", locComp.clone().add(15, 28, 0), faceComp, 159, (byte)14, TextAlign.CENTER); -// UtilBlockText.MakeText("CLANS", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); +// UtilBlockText.MakeText("CLANS", locComp.clone().add(16, 28, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); //Arcade UtilBlockText.MakeText("ARCADE", locArcade, faceArcade, 159, (byte)5, TextAlign.CENTER); @@ -115,13 +115,13 @@ public class TextManager extends MiniPlugin return; UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 15), faceArcade, 159, (byte)4, TextAlign.CENTER); - UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText(GetArcadeText(0), locArcade.clone().add(0, 14, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 15), faceArcade, 159, (byte)1, TextAlign.CENTER); - UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText(GetArcadeText(1), locArcade.clone().add(0, 21, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 15), faceArcade, 159, (byte)14, TextAlign.CENTER); - UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText(GetArcadeText(2), locArcade.clone().add(0, 28, 16), faceArcade, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); arcadeIndex = (arcadeIndex + 3)%arcadeGames.length; } @@ -149,13 +149,13 @@ public class TextManager extends MiniPlugin if (smashIndex == 1) color = 0; //UtilText.MakeText("SUPER SMASH MOBS", locOther, faceOther, 159, color, TextAlign.CENTER); - //UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 0, -1), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + //UtilText.MakeText("SUPER SMASH MOBS", locOther.clone().add(0, 0, -1), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -15), faceOther, 159, color, TextAlign.CENTER); - UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -16), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText("SUPER SMASH MOBS", locClassics.clone().add(0, 14, -16), faceOther, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); UtilText.MakeText("DOMINATE", locComp.clone().add(15, 14, 0), faceComp, 159, color, TextAlign.CENTER); - UtilText.MakeText("DOMINATE", locComp.clone().add(16, 14, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (_manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); + UtilText.MakeText("DOMINATE", locComp.clone().add(16, 14, 0), faceComp, (Manager.Type == HubType.Halloween) ? 89 : 159, (Manager.Type == HubType.Halloween) ? (byte)0 : (byte)15, TextAlign.CENTER); //System.out.println("TextCreator : " + (System.currentTimeMillis() - startTime) + "ms"); } */ diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java index 0e9da60d7..3ce30af02 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/ItemSalesPackage.java @@ -10,8 +10,8 @@ public class ItemSalesPackage extends SalesPackageBase public ItemSalesPackage(Item item) { super("Champions " + item.GetName(), Material.BOOK, (byte)0, item.GetDesc(), item.GetGemCost()); - _free = item.isFree(); - _knownPackage = false; - _currencyCostMap.put(GlobalCurrency.GEM, item.GetGemCost()); + Free = item.isFree(); + KnownPackage = false; + CurrencyCostMap.put(GlobalCurrency.GEM, item.GetGemCost()); } } diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java index 54b3a181b..420427e31 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/shop/salespackage/SkillSalesPackage.java @@ -10,8 +10,8 @@ public class SkillSalesPackage extends SalesPackageBase public SkillSalesPackage(ISkill skill) { super("Champions " + skill.GetName(), Material.BOOK, (byte)0, skill.GetDesc(0), skill.GetGemCost()); - _free = skill.IsFree(); - _knownPackage = false; - _currencyCostMap.put(GlobalCurrency.GEM, skill.GetGemCost()); + Free = skill.IsFree(); + KnownPackage = false; + CurrencyCostMap.put(GlobalCurrency.GEM, skill.GetGemCost()); } } diff --git a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java index 10dde2ab1..fcfa571e1 100644 --- a/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java +++ b/Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/condition/ConditionFactory.java @@ -194,7 +194,7 @@ public class ConditionFactory public Condition Vulnerable(String reason, LivingEntity ent, LivingEntity source, double duration, int mult, boolean extend, boolean showIndicator, boolean ambient) { - return Manager.AddCondition(new Vulnerability(_manager, reason, ent, source, + return Manager.AddCondition(new Vulnerability(Manager, reason, ent, source, ConditionType.WITHER, mult, (int)(20 * duration), extend, Material.BONE, (byte)0, showIndicator, ambient)); } 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 12e28e680..68767903c 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 @@ -853,7 +853,7 @@ public class EventGame extends Game } if(command.contentEquals("[EFFECT]")) { - //Manager.GetEventModule().commandEffect(_manager.GetGameHostManager().getHost(), commandArgs, varMap.get(1)); + //Manager.GetEventModule().commandEffect(Manager.GetGameHostManager().getHost(), commandArgs, varMap.get(1)); for(Player player : varMap.get(1)) { player.addPotionEffect(new PotionEffect(PotionEffectType.getByName(args[2]), Integer.parseInt(args[3].split(" ")[0]), Integer.parseInt(args[3].split(" ")[1]))); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java index 70be9fded..d4831cbbb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSkeleton.java @@ -70,7 +70,7 @@ public class KitSkeleton // { // event.setCancelled(true); // -// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() +// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() // { // @Override // public void run() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java index 13be5a6cb..fcf33d0aa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/mobs/KitSnowman.java @@ -70,7 +70,7 @@ public class KitSnowman // { // event.setCancelled(true); // -// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(_manager.getPlugin(), new Runnable() +// Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() // { // @Override // public void run() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java index bc49dd5b9..5d63023a5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java @@ -230,7 +230,7 @@ public class PerkDestructor extends Perk // @EventHandler // public void collide(PlayerTeleportEvent event) // { -// if (Manager.GetGame() == null || !_manager.GetGame().IsLive()) +// if (Manager.GetGame() == null || !Manager.GetGame().IsLive()) // return; // // if (event.getCause() != TeleportCause.ENDER_PEARL) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java index 78714db86..0157bf271 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidRifle.java @@ -89,7 +89,7 @@ public class PerkSquidRifle extends Perk implements IThrown //_fireworks.put(fw, vel); //Projectile - //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, _manager.GetDisguise()); + //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, Manager.GetDisguise()); } catch (Exception e) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java index cea32dd65..797468967 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidShotgun.java @@ -96,7 +96,7 @@ public class PerkSquidShotgun extends Perk implements IThrown //_fireworks.put(fw, vel); //Projectile - //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, _manager.GetDisguise()); + //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, Manager.GetDisguise()); } catch (Exception e) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java index c4d864c88..96b38e418 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSquidSniper.java @@ -89,7 +89,7 @@ public class PerkSquidSniper extends Perk implements IThrown //_fireworks.put(fw, vel); //Projectile - //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, _manager.GetDisguise()); + //Manager.GetProjectile().AddThrow(fw, player, this, -1, true, true, true, 3d, Manager.GetDisguise()); } catch (Exception e) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java index 5a8c75f54..6fbea37dc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/shop/KitPackage.java @@ -9,7 +9,7 @@ public class KitPackage extends SalesPackageBase public KitPackage(String gameName, Kit kit) { super(gameName + " " + kit.GetName(), kit.getDisplayMaterial(), kit.GetDesc()); - _knownPackage = false; - _currencyCostMap.put(GlobalCurrency.GEM, kit.GetCost()); + KnownPackage = false; + CurrencyCostMap.put(GlobalCurrency.GEM, kit.GetCost()); } } From ed39d5daa72f6be73c36358e051c9cd6e45b7c31 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Fri, 31 Mar 2017 01:16:30 -0300 Subject: [PATCH 50/91] Reverted rename --- .../core/gadget/gadgets/item/ItemBubbleBlaster.java | 7 ++----- .../core/gadget/gadgets/particle/ParticleWingsBee.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java index ff0ba75ed..525cabf58 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemBubbleBlaster.java @@ -1,8 +1,6 @@ package mineplex.core.gadget.gadgets.item; import java.awt.Color; -import java.time.Month; -import java.time.YearMonth; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -42,8 +40,7 @@ public class ItemBubbleBlaster extends ItemGadget public ItemBubbleBlaster(GadgetManager manager) { super(manager, "Bubble Blaster", UtilText.splitLinesToArray(new String[]{C.cGray + "Placeholder"}, LineFormat.LORE), - -14, Material.DIAMOND_BARDING, (byte) 0, 5000, new Ammo("Bubble", "Bubble", Material.DIAMOND_BARDING, (byte) 0, new String[]{C.cGray + "Placeholder"}, -5, 1), - YearMonth.of(2017, Month.APRIL)); + -14, Material.DIAMOND_BARDING, (byte) 0, 5000, new Ammo("Bubble", "Bubble", Material.DIAMOND_BARDING, (byte) 0, new String[]{C.cGray + "Placeholder"}, -5, 1)); } @Override @@ -78,7 +75,7 @@ public class ItemBubbleBlaster extends ItemGadget event.setCancelled(true); - player.getInventory().setItem(_manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(_manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); + player.getInventory().setItem(Manager.getActiveItemSlot(), ItemStackFactory.Instance.CreateStack(getDisplayMaterial(), getDisplayData(), 1, F.item(Manager.getInventoryManager().Get(player).getItemCount(getName()) + " " + getName()))); // TODO CHANGE COLOR IF RAINBOW // TODO COOLDOWN AFTER MAX OF 5 SECONDS HOLDING diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java index 7d25d438e..b413766e1 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleWingsBee.java @@ -36,7 +36,7 @@ public class ParticleWingsBee extends ParticleGadget public void playParticle(Player player, UpdateEvent event) { Location loc = player.getLocation().add(0, 1, 0).add(player.getLocation().getDirection().multiply(-0.4)); - if (_manager.isMoving(player)) + if (Manager.isMoving(player)) { if (event.getType() == UpdateType.TICK) { From 10a1f71558ba698443fc89612ec6ef6b1790bdc7 Mon Sep 17 00:00:00 2001 From: Alexander Meech Date: Thu, 30 Mar 2017 01:54:07 -0400 Subject: [PATCH 51/91] Add RustyDawgT to featured creators --- .../Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java index 0c261460c..06f1d69b4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java @@ -190,6 +190,7 @@ public class BonusManager extends MiniClientPlugin implements I { _youtubers.add(Pair.create("Sigils", "https://www.youtube.com/user/SigilsPlaysGames?sub_confirmation=1")); _youtubers.add(Pair.create("SallyGreenGamer", "https://www.youtube.com/channel/UCt8eypdLUND5CBvgXzEZrxw?sub_confirmation=1")); + _youtubers.add(Pair.create("RustyDawgT", "https://www.youtube.com/user/RustyDawgT?sub_confirmation=1")); } _youtubers.add(Pair.create("SamitoD", "https://www.youtube.com/user/SamitoD?sub_confirmation=1")); @@ -248,6 +249,7 @@ public class BonusManager extends MiniClientPlugin implements I { _youtubers.add(Pair.create("Sigils", "https://www.youtube.com/user/SigilsPlaysGames?sub_confirmation=1")); _youtubers.add(Pair.create("SallyGreenGamer", "https://www.youtube.com/channel/UCt8eypdLUND5CBvgXzEZrxw?sub_confirmation=1")); + _youtubers.add(Pair.create("RustyDawgT", "https://www.youtube.com/user/RustyDawgT?sub_confirmation=1")); } _youtubers.add(Pair.create("SamitoD", "https://www.youtube.com/user/SamitoD?sub_confirmation=1")); From 03d781ca7099ab727ae40a9e156a93bbc15653c8 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 19 Mar 2017 23:07:28 +0000 Subject: [PATCH 52/91] It be April fools matey, walk yee plank --- .../src/mineplex/core/common/Rank.java | 5 + .../core/aprilfools/AprilFoolsManager.java | 306 ++++++++---------- .../src/mineplex/game/clans/Clans.java | 3 + .../src/mineplex/clanshub/ClansHub.java | 2 +- .../Mineplex.Hub/src/mineplex/hub/Hub.java | 2 +- .../src/mineplex/hub/HubManager.java | 9 +- .../src/nautilus/game/arcade/Arcade.java | 3 + .../game/arcade/game/games/draw/Draw.java | 4 + .../arcade/managers/chat/GameChatManager.java | 3 +- .../src/mineplex/gemhunters/GemHunters.java | 7 +- .../mineplex/gemhunters/chat/ChatModule.java | 2 +- 11 files changed, 167 insertions(+), 179 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java index aef681107..6871107bb 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java @@ -72,6 +72,11 @@ public enum Rank return _description; } + public void setName(String name) + { + Name = name; + } + public String getRawTag() { if (Name.equalsIgnoreCase("ALL")) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 6507b48d6..7421927d5 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -1,203 +1,181 @@ package mineplex.core.aprilfools; -import java.util.Calendar; - -import org.bukkit.Sound; -import org.bukkit.entity.Player; +import com.google.common.collect.ImmutableMap; +import mineplex.core.MiniPlugin; +import mineplex.core.common.Rank; +import mineplex.core.common.util.UtilTextMiddle; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.MiniPlugin; -import mineplex.core.account.CoreClientManager; -import mineplex.core.common.util.UtilMath; -import mineplex.core.common.util.UtilServer; -import mineplex.core.common.util.UtilTextMiddle; -import mineplex.core.disguise.DisguiseManager; -import mineplex.core.disguise.disguises.DisguiseCow; -import mineplex.core.updater.UpdateType; -import mineplex.core.updater.event.UpdateEvent; +import java.util.Map; public class AprilFoolsManager extends MiniPlugin { - public static AprilFoolsManager Instance; - + + private static final Map CHAT_REPLACEMENTS = ImmutableMap.builder() + .put("you", "ye") + .put("yes", "aye") + .put("hello", "ahoy") + .put("hey", "ahoy") + .put("hi", "ahoy") + .put("friend", "matey") + .put("friends", "mateys") + .put("chest", "booty") + .put("sword", "cutlass") + .put("my", "me") + .put("dog", "seadog") + .put("dead", "shark bait") + .put("hack", "scurvy") + .put("hacks", "scurvy") + .put("hax", "scurvy") + .put("haks", "scurvy") + .put("owner", "captain") + .put("leader", "captain") + .put("lt", "captain") + .put("dev", "firstmate") + .put("developer", "firstmate") + .put("admin", "firstmate") + .build(); + private static final Map RANK_REPLACEMENTS = ImmutableMap.builder() + .put(Rank.ETERNAL, "Captain") + .put(Rank.TITAN, "FirstMate") + .put(Rank.LEGEND, "Boatswain") + .put(Rank.HERO, "Gunner") + .put(Rank.ULTRA, "Parrot") + .put(Rank.ALL, "Seadog") + .build(); + + private static AprilFoolsManager _instance; + private boolean _enabled; - private DisguiseManager _disguiseManager; - private CoreClientManager _clientManager; - - protected AprilFoolsManager(JavaPlugin plugin, CoreClientManager clientManager, DisguiseManager disguiseManager) + + public AprilFoolsManager() { - super("April Fools", plugin); - - _disguiseManager = disguiseManager; - _clientManager = clientManager; - - Calendar c = Calendar.getInstance(); - _enabled = (c.get(Calendar.MONTH) == Calendar.APRIL && c.get(Calendar.DAY_OF_MONTH) == 1); - } - - public static void Initialize(JavaPlugin plugin, CoreClientManager clientManager, DisguiseManager disguiseManager) - { - Instance = new AprilFoolsManager(plugin, clientManager, disguiseManager); + super("April Fools"); + + _instance = this; + _enabled = true; + + if (_enabled) + { + for (Map.Entry entry : RANK_REPLACEMENTS.entrySet()) + { + entry.getKey().setName(entry.getValue()); + } + } } - @EventHandler - public void updateEnabled(UpdateEvent event) - { - if (event.getType() != UpdateType.SLOW) - return; - - Calendar c = Calendar.getInstance(); - _enabled = (c.get(Calendar.MONTH) == Calendar.APRIL && c.get(Calendar.DAY_OF_MONTH) == 1); - } - - @EventHandler(priority = EventPriority.LOW) - public void chatAdd(AsyncPlayerChatEvent event) + @EventHandler(priority = EventPriority.LOWEST) + public void chat(AsyncPlayerChatEvent event) { if (!_enabled) - return; - - String[] words = event.getMessage().split(" "); - - String out = ""; - for (String word : words) { - //Prefix - if (Math.random() > 0.85) + return; + } + + String message = event.getMessage(); + String pirateMessage = ""; + + for (String word : message.split(" ")) + { + String wordLower = word.toLowerCase(); + + if (CHAT_REPLACEMENTS.containsKey(wordLower)) { - out += "moo"; - - for (int i=0 ; i 0.85) - { - out += word + " "; - - out += "moo"; - - for (int i=0 ; i 0.99) - { - out += "moo"; - - for (int i=3 ; i 0.85) { - if (_disguiseManager.getDisguise(player) != null) + pirateMessage += "matey!"; + } + else if (random > 0.7) + { + String ar = "ar"; + + for (int i = 0; i < 10; i++) { - //Moo - if (Math.random() > 0.8) + if (Math.random() > 0.75) { - if (_disguiseManager.getDisguise(player) instanceof DisguiseCow) - { - player.getWorld().playSound(player.getLocation(), Sound.COW_IDLE, (float)Math.random() + 0.5f, (float)Math.random() + 0.5f); - } + break; } - - continue; + + ar += "r"; } - //Disguise - DisguiseCow disguise = new DisguiseCow(player); - disguise.setName(getName(player), _clientManager.Get(player).GetRank()); - disguise.setCustomNameVisible(true); - _disguiseManager.disguise(disguise); + pirateMessage += "a" + ar + "gh"; } - } - - public boolean isActive() - { - return _enabled; - } - - public String getName(Player player) - { - //Name - int index = 0; - boolean hitVowel = false; - for (int i=0 ; i 0.55) { - //Detect vowel ;o - if (player.getName().toLowerCase().charAt(i) == 'a' || - player.getName().toLowerCase().charAt(i) == 'e' || - player.getName().toLowerCase().charAt(i) == 'i' || - player.getName().toLowerCase().charAt(i) == 'o' || - player.getName().toLowerCase().charAt(i) == 'u') - { - hitVowel = true; - } - //Post vowel consonant - stop here - else if (hitVowel) - { - break; - } - - index = i+1; + pirateMessage += "scallywag"; } - String name = "Moo" + player.getName().substring(index, player.getName().length()); - - if (name.length() > 16) - name = name.substring(0, 16); - - return name; + event.setMessage(pirateMessage.trim()); } - public void setEnabled(boolean b) + @EventHandler + public void updateRandomMessage(UpdateEvent event) { - Calendar c = Calendar.getInstance(); - _enabled = b && (c.get(Calendar.MONTH) == Calendar.APRIL && c.get(Calendar.DAY_OF_MONTH) == 1); + if (!_enabled || event.getType() != UpdateType.SLOW) + { + return; + } + + String message = null; + double random = Math.random(); + + if (random > 0.99) + { + message = "Eye Eye Captain!"; + } + else if (random > 0.98) + { + message = "Arggggggh"; + } + else if (random > 0.97) + { + message = "Mateyy"; + } + + if (message == null) + { + return; + } + + UtilTextMiddle.display("", message, 10, 40, 10); + } + + public void setEnabled(boolean enabled) + { + _enabled = enabled; + } + + public static AprilFoolsManager getInstance() + { + if (_instance == null) + { + _instance = new AprilFoolsManager(); + } + + return _instance; } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java index 8df0e0df1..8bddf656b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -1,5 +1,6 @@ package mineplex.game.clans; +import mineplex.core.aprilfools.AprilFoolsManager; import net.minecraft.server.v1_8_R3.MinecraftServer; import org.bukkit.Bukkit; @@ -265,6 +266,8 @@ public class Clans extends JavaPlugin require(TwoFactorAuth.class); + AprilFoolsManager.getInstance(); + // Disable spigot item merging for (World world : getServer().getWorlds()) { diff --git a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java index 7f10bdfca..e0997337b 100644 --- a/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java +++ b/Plugins/Mineplex.Hub.Clans/src/mineplex/clanshub/ClansHub.java @@ -166,7 +166,7 @@ public class ClansHub extends JavaPlugin new ResourcePackManager(this, portal); new GlobalPacketManager(this, clientManager, serverStatusManager, inventoryManager, donationManager, petManager, statsManager, hubManager.getBonusManager().getRewardManager()); - AprilFoolsManager.Initialize(this, clientManager, disguiseManager); + AprilFoolsManager.getInstance(); new EternalGiveawayManager(this, clientManager, serverStatusManager); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index 1269d0ed9..55f7b7b97 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -199,7 +199,7 @@ public class Hub extends JavaPlugin implements IRelation new SnapshotPlugin(this, snapshotManager, clientManager); new ReportPlugin(this, reportManager); - AprilFoolsManager.Initialize(this, clientManager, disguiseManager); + AprilFoolsManager.getInstance(); new EternalGiveawayManager(this, clientManager, serverStatusManager); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index 8ac9b1e7c..b4a945508 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -610,20 +610,13 @@ public class HubManager extends MiniClientPlugin implements IChatMess Player player = event.getPlayer(); String playerName = player.getName(); - - // April Fools - if (AprilFoolsManager.Instance.isActive()) - playerName = AprilFoolsManager.Instance.getName(player); - Rank rank = GetClients().Get(player).getRealOrDisguisedRank(); //Level Prefix String levelStr = _achievementManager.getMineplexLevel(player, rank); //Rank Prefix - String rankStr = ""; - if (rank != Rank.ALL) - rankStr = rank.getTag(true, true) + " "; + String rankStr = rank.getTag(true, true); //Party Chat if (event.getMessage().charAt(0) == '@') { 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 302603df5..82081472c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -3,6 +3,7 @@ package nautilus.game.arcade; import java.io.File; import java.util.HashMap; +import mineplex.core.aprilfools.AprilFoolsManager; import net.minecraft.server.v1_8_R3.MinecraftServer; import org.bukkit.Bukkit; @@ -202,6 +203,8 @@ public class Arcade extends JavaPlugin require(TwoFactorAuth.class); new WebsiteLinkManager(this, _clientManager); + AprilFoolsManager.getInstance(); + //Updates getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1); 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 457fcb5ce..2d38a6528 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 @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; +import mineplex.core.aprilfools.AprilFoolsManager; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; @@ -233,6 +234,8 @@ public class Draw extends SoloGame .setGiveCompassToSpecs(true) .setGiveCompassToAlive(false) .register(this); + + AprilFoolsManager.getInstance().setEnabled(false); } @Override @@ -1004,6 +1007,7 @@ public class Draw extends SoloGame if (player.isOnline()) AddGems(player, 10, "Participation", false, false); + AprilFoolsManager.getInstance().setEnabled(true); SetState(GameState.End); AnnounceEnd(places); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java index 11fa85b5c..047e69531 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java @@ -111,8 +111,7 @@ public class GameChatManager implements Listener } else { - if (rank != Rank.ALL) - rankStr = rank.getTag(true, true) + " " + C.Reset; + rankStr = rank.getTag(true, true) + " " + C.Reset; } //Party Chat diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java index f8dcac176..f6f2cee55 100644 --- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java +++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/GemHunters.java @@ -1,5 +1,6 @@ package mineplex.gemhunters; +import mineplex.core.aprilfools.AprilFoolsManager; import net.minecraft.server.v1_8_R3.MinecraftServer; import org.bukkit.Bukkit; @@ -294,8 +295,10 @@ public class GemHunters extends JavaPlugin new WorldListeners(this); new TimeCycle(this); new UndergroundMobs(this); - new DebugListeners(this); - + new DebugListeners(this); + + AprilFoolsManager.getInstance(); + // UpdateEvent!!! new Updater(this); diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java index 02e210ff5..5d0c9e4a8 100644 --- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java +++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java @@ -62,7 +62,7 @@ public class ChatModule extends MiniPlugin String playerName = player.getName(); Rank rank = _clientManager.Get(player).getRealOrDisguisedRank(); - String rankString = rank == Rank.ALL ? "" : rank.getTag(true, true); + String rankString = rank.getTag(true, true); // Create a message that follows the rest of the network's chat format String message = (rankString + " " + C.cYellow + playerName + " "); From 66cea341a5f3fe33b1ac97b1b99927b6433c9ab5 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 19 Mar 2017 23:32:02 +0000 Subject: [PATCH 53/91] Use regex and remove "g" --- .../core/aprilfools/AprilFoolsManager.java | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 7421927d5..320130474 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -3,12 +3,14 @@ package mineplex.core.aprilfools; import com.google.common.collect.ImmutableMap; import mineplex.core.MiniPlugin; import mineplex.core.common.Rank; +import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.jcp.xml.dsig.internal.dom.Utils; import java.util.Map; @@ -24,14 +26,27 @@ public class AprilFoolsManager extends MiniPlugin .put("friend", "matey") .put("friends", "mateys") .put("chest", "booty") + .put("chests", "booty") + .put("treasure", "booty") + .put("shards", "riches") .put("sword", "cutlass") .put("my", "me") + .put("gold", "dubloon") .put("dog", "seadog") - .put("dead", "shark bait") + .put("die", "walk the plank") + .put("boat", "ship") + .put("drink", "grog") + .put("water", "grog") + .put("flag", "jolly roger") + .put("am", "be") + .put("girl", "lass") + .put("woman", "lass") + .put("noob", "shark bait") .put("hack", "scurvy") .put("hacks", "scurvy") .put("hax", "scurvy") .put("haks", "scurvy") + .put("hacker", "") .put("owner", "captain") .put("leader", "captain") .put("lt", "captain") @@ -45,12 +60,12 @@ public class AprilFoolsManager extends MiniPlugin .put(Rank.LEGEND, "Boatswain") .put(Rank.HERO, "Gunner") .put(Rank.ULTRA, "Parrot") - .put(Rank.ALL, "Seadog") .build(); private static AprilFoolsManager _instance; private boolean _enabled; + private boolean _enabledTitle; public AprilFoolsManager() { @@ -58,6 +73,7 @@ public class AprilFoolsManager extends MiniPlugin _instance = this; _enabled = true; + _enabledTitle = UtilServer.isHubServer() || UtilServer.isTestServer(); if (_enabled) { @@ -82,6 +98,7 @@ public class AprilFoolsManager extends MiniPlugin for (String word : message.split(" ")) { String wordLower = word.toLowerCase(); + wordLower = wordLower.replaceAll("[^a-zA-Z0-9]", ""); if (CHAT_REPLACEMENTS.containsKey(wordLower)) { @@ -98,6 +115,11 @@ public class AprilFoolsManager extends MiniPlugin } else { + if (word.length() > 1 && wordLower.charAt(wordLower.length() - 1) == 'g') + { + word = word.substring(0, word.length() - 2); + } + pirateMessage += word + " "; } } @@ -135,7 +157,7 @@ public class AprilFoolsManager extends MiniPlugin @EventHandler public void updateRandomMessage(UpdateEvent event) { - if (!_enabled || event.getType() != UpdateType.SLOW) + if (!_enabledTitle || event.getType() != UpdateType.SLOW) { return; } From 4c882ae4a8db0cba312d6367c72947c2880a45c3 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 19 Mar 2017 23:34:33 +0000 Subject: [PATCH 54/91] Fix chat handling elsewhere --- .../src/mineplex/core/aprilfools/AprilFoolsManager.java | 1 - Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java | 4 +++- .../src/nautilus/game/arcade/game/games/draw/Draw.java | 4 ---- .../src/mineplex/gemhunters/chat/ChatModule.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 320130474..37172c055 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -10,7 +10,6 @@ import mineplex.core.updater.event.UpdateEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.jcp.xml.dsig.internal.dom.Utils; import java.util.Map; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java index b4a945508..c01ec5d2b 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java @@ -616,7 +616,9 @@ public class HubManager extends MiniClientPlugin implements IChatMess String levelStr = _achievementManager.getMineplexLevel(player, rank); //Rank Prefix - String rankStr = rank.getTag(true, true); + String rankStr = ""; + if (rank != Rank.ALL) + rankStr = rank.getTag(true, true) + " "; //Party Chat if (event.getMessage().charAt(0) == '@') { 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 2d38a6528..457fcb5ce 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 @@ -8,7 +8,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import mineplex.core.aprilfools.AprilFoolsManager; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.GameMode; @@ -234,8 +233,6 @@ public class Draw extends SoloGame .setGiveCompassToSpecs(true) .setGiveCompassToAlive(false) .register(this); - - AprilFoolsManager.getInstance().setEnabled(false); } @Override @@ -1007,7 +1004,6 @@ public class Draw extends SoloGame if (player.isOnline()) AddGems(player, 10, "Participation", false, false); - AprilFoolsManager.getInstance().setEnabled(true); SetState(GameState.End); AnnounceEnd(places); } diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java index 5d0c9e4a8..02e210ff5 100644 --- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java +++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/chat/ChatModule.java @@ -62,7 +62,7 @@ public class ChatModule extends MiniPlugin String playerName = player.getName(); Rank rank = _clientManager.Get(player).getRealOrDisguisedRank(); - String rankString = rank.getTag(true, true); + String rankString = rank == Rank.ALL ? "" : rank.getTag(true, true); // Create a message that follows the rest of the network's chat format String message = (rankString + " " + C.cYellow + playerName + " "); From e74486c1bc92f15334350181992ac9bfc00c2ed7 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 20 Mar 2017 00:13:23 +0000 Subject: [PATCH 55/91] Add even more priate speak --- .../core/aprilfools/AprilFoolsManager.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 37172c055..885b37691 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -36,10 +36,18 @@ public class AprilFoolsManager extends MiniPlugin .put("boat", "ship") .put("drink", "grog") .put("water", "grog") + .put("dirt", "flith") .put("flag", "jolly roger") .put("am", "be") + .put("are", "be") + .put("your", "yer") .put("girl", "lass") .put("woman", "lass") + .put("hell", "davy jones' locker") + .put("nether", "davy jones' locker") + .put("of", "o'") + .put("reward", "bounty") + .put("prize", "bounty") .put("noob", "shark bait") .put("hack", "scurvy") .put("hacks", "scurvy") @@ -114,9 +122,14 @@ public class AprilFoolsManager extends MiniPlugin } else { - if (word.length() > 1 && wordLower.charAt(wordLower.length() - 1) == 'g') + if (wordLower.length() > 1 && wordLower.charAt(wordLower.length() - 1) == 'g') { - word = word.substring(0, word.length() - 2); + int g = word.lastIndexOf('g'); + char[] chars = word.toCharArray(); + + chars[g] = '\''; + + word = String.valueOf(chars); } pirateMessage += word + " "; @@ -174,7 +187,7 @@ public class AprilFoolsManager extends MiniPlugin } else if (random > 0.97) { - message = "Mateyy"; + message = "Mateyy!"; } if (message == null) From 52323f61199f1c763ca863e16b6841dcc8ad22c4 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 20 Mar 2017 00:35:54 +0000 Subject: [PATCH 56/91] Add more replacement words --- .../src/mineplex/core/aprilfools/AprilFoolsManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 885b37691..eb6541de7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -48,12 +48,16 @@ public class AprilFoolsManager extends MiniPlugin .put("of", "o'") .put("reward", "bounty") .put("prize", "bounty") + .put("shoot", "fire in the hole") + .put("clumsy", "landlubber") + .put("clean", "swab") + .put("look", "avast ye") .put("noob", "shark bait") .put("hack", "scurvy") .put("hacks", "scurvy") .put("hax", "scurvy") .put("haks", "scurvy") - .put("hacker", "") + .put("hacker", "scurvy") .put("owner", "captain") .put("leader", "captain") .put("lt", "captain") From 4b22355348bf1eb9209497785fc4068fd10f5dc9 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 20 Mar 2017 23:43:35 +0000 Subject: [PATCH 57/91] Add more fun stuff --- .../core/aprilfools/AprilFoolsManager.java | 17 ++++++- .../aprilfools/command/PirateSongCommand.java | 48 +++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/aprilfools/command/PirateSongCommand.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index eb6541de7..7faa06b6d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -2,6 +2,7 @@ package mineplex.core.aprilfools; import com.google.common.collect.ImmutableMap; import mineplex.core.MiniPlugin; +import mineplex.core.aprilfools.command.PirateSongCommand; import mineplex.core.common.Rank; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; @@ -33,6 +34,7 @@ public class AprilFoolsManager extends MiniPlugin .put("gold", "dubloon") .put("dog", "seadog") .put("die", "walk the plank") + .put("kill", "keelhaul") .put("boat", "ship") .put("drink", "grog") .put("water", "grog") @@ -52,6 +54,9 @@ public class AprilFoolsManager extends MiniPlugin .put("clumsy", "landlubber") .put("clean", "swab") .put("look", "avast ye") + .put("omg", "shiver my timbers") + .put("wood", "timber") + .put("trash", "poop deck") .put("noob", "shark bait") .put("hack", "scurvy") .put("hacks", "scurvy") @@ -95,6 +100,12 @@ public class AprilFoolsManager extends MiniPlugin } } + @Override + public void addCommands() + { + addCommand(new PirateSongCommand(this)); + } + @EventHandler(priority = EventPriority.LOWEST) public void chat(AsyncPlayerChatEvent event) { @@ -183,7 +194,7 @@ public class AprilFoolsManager extends MiniPlugin if (random > 0.99) { - message = "Eye Eye Captain!"; + message = "Aye Aye Captain!"; } else if (random > 0.98) { @@ -193,6 +204,10 @@ public class AprilFoolsManager extends MiniPlugin { message = "Mateyy!"; } + else if (random > 0.96) + { + message = "Shiver me timbers!"; + } if (message == null) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/command/PirateSongCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/command/PirateSongCommand.java new file mode 100644 index 000000000..405d88066 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/command/PirateSongCommand.java @@ -0,0 +1,48 @@ +package mineplex.core.aprilfools.command; + +import mineplex.core.aprilfools.AprilFoolsManager; +import mineplex.core.command.CommandBase; +import mineplex.core.common.Rank; +import mineplex.core.common.util.UtilTextMiddle; +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitRunnable; + +public class PirateSongCommand extends CommandBase +{ + + private static final String[] PIRATE_SONG = { + "Are you ready kids?", + "Aye aye captain!", + "I can't hear you!", + "AYE AYE CAPTAIN!", + "OOOOOOOOOOOOH", + "Who lives in a pineapple under the sea?", + "Spongebob Squarepants!" + }; + + public PirateSongCommand(AprilFoolsManager plugin) + { + super(plugin, Rank.ADMIN, "piratesong"); + } + + @Override + public void Execute(Player caller, String[] args) + { + Plugin.runSyncTimer(new BukkitRunnable() + { + int index = 0; + + @Override + public void run() + { + if (index == PIRATE_SONG.length) + { + cancel(); + return; + } + + UtilTextMiddle.display("", PIRATE_SONG[index++], 10, 60, 10); + } + }, 20, 100); + } +} From 4053e439649f6e0eec5d11a3656dc1afe60215aa Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 25 Mar 2017 14:14:26 +0000 Subject: [PATCH 58/91] Add a manual toggle --- .../mineplex/core/aprilfools/AprilFoolsManager.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 7faa06b6d..b7faa7279 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -17,6 +17,11 @@ import java.util.Map; public class AprilFoolsManager extends MiniPlugin { + /** + * Manually can be toggled to enable or disable the April Fools activities. + */ + private static final boolean ENABLED = true; + private static final Map CHAT_REPLACEMENTS = ImmutableMap.builder() .put("you", "ye") .put("yes", "aye") @@ -88,7 +93,7 @@ public class AprilFoolsManager extends MiniPlugin super("April Fools"); _instance = this; - _enabled = true; + setEnabled(true); _enabledTitle = UtilServer.isHubServer() || UtilServer.isTestServer(); if (_enabled) @@ -184,7 +189,7 @@ public class AprilFoolsManager extends MiniPlugin @EventHandler public void updateRandomMessage(UpdateEvent event) { - if (!_enabledTitle || event.getType() != UpdateType.SLOW) + if (!_enabled || !_enabledTitle || event.getType() != UpdateType.SLOW) { return; } @@ -219,7 +224,7 @@ public class AprilFoolsManager extends MiniPlugin public void setEnabled(boolean enabled) { - _enabled = enabled; + _enabled = ENABLED && enabled; } public static AprilFoolsManager getInstance() From 016860b6153464e257ac9136634d1c92320d82d6 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 26 Mar 2017 13:54:03 +0100 Subject: [PATCH 59/91] Replace NPCs with Pirates --- .../core/aprilfools/AprilFoolsManager.java | 16 ++++++++++++++++ .../src/mineplex/core/npc/NpcManager.java | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index b7faa7279..abd17ded0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -1,6 +1,7 @@ package mineplex.core.aprilfools; import com.google.common.collect.ImmutableMap; +import com.mojang.authlib.GameProfile; import mineplex.core.MiniPlugin; import mineplex.core.aprilfools.command.PirateSongCommand; import mineplex.core.common.Rank; @@ -8,6 +9,7 @@ import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; +import mineplex.core.utils.UtilGameProfile; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; @@ -88,6 +90,8 @@ public class AprilFoolsManager extends MiniPlugin private boolean _enabled; private boolean _enabledTitle; + private GameProfile _pirateSkin; + public AprilFoolsManager() { super("April Fools"); @@ -98,6 +102,8 @@ public class AprilFoolsManager extends MiniPlugin if (_enabled) { + UtilGameProfile.getProfileByName("Moppletop", false, response -> _pirateSkin = response); + for (Map.Entry entry : RANK_REPLACEMENTS.entrySet()) { entry.getKey().setName(entry.getValue()); @@ -222,11 +228,21 @@ public class AprilFoolsManager extends MiniPlugin UtilTextMiddle.display("", message, 10, 40, 10); } + public GameProfile getPirateSkin() + { + return _pirateSkin; + } + public void setEnabled(boolean enabled) { _enabled = ENABLED && enabled; } + public boolean isEnabled() + { + return _enabled; + } + public static AprilFoolsManager getInstance() { if (_instance == null) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java index 4e76af53b..7ea920ad6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java @@ -4,6 +4,10 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.*; +import mineplex.core.aprilfools.AprilFoolsManager; +import mineplex.core.disguise.DisguiseManager; +import mineplex.core.disguise.disguises.DisguisePlayer; +import mineplex.core.utils.UtilGameProfile; import org.bukkit.*; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; @@ -84,6 +88,8 @@ public class NpcManager extends MiniPlugin final Map _npcMap = new HashMap<>(); private final Set _npcDeletingPlayers = new HashSet<>(); + private final DisguiseManager _disguise; + public NpcManager(JavaPlugin plugin, Creature creature) { super("NpcManager", plugin); @@ -100,6 +106,8 @@ public class NpcManager extends MiniPlugin _plugin.getServer().getPluginManager().registerEvents(this, _plugin); + _disguise = require(DisguiseManager.class); + try { loadNpcs(); @@ -362,6 +370,17 @@ public class NpcManager extends MiniPlugin npc.setEntity(entity); + // Disguise the npc if April Fools + AprilFoolsManager aprilFoolsManager = AprilFoolsManager.getInstance(); + if (aprilFoolsManager.isEnabled()) + { + DisguisePlayer playerDisguise = new DisguisePlayer(entity, aprilFoolsManager.getPirateSkin()); + + playerDisguise.setSendSkinDataToSelf(false); + + _disguise.disguise(playerDisguise); + } + return entity; } From bd841762d1a9b15870234d600f91783d04ac61db Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 26 Mar 2017 14:13:11 +0100 Subject: [PATCH 60/91] Run skin getting on the main thread --- .../src/mineplex/core/aprilfools/AprilFoolsManager.java | 9 ++++++++- .../Mineplex.Core/src/mineplex/core/titles/Titles.java | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index abd17ded0..64c4f6bda 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -102,7 +102,14 @@ public class AprilFoolsManager extends MiniPlugin if (_enabled) { - UtilGameProfile.getProfileByName("Moppletop", false, response -> _pirateSkin = response); + try + { + _pirateSkin = UtilGameProfile.getProfileByName("Moppletop", false, null).get(); + } + catch (Exception e) + { + e.printStackTrace(); + } for (Map.Entry entry : RANK_REPLACEMENTS.entrySet()) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/titles/Titles.java b/Plugins/Mineplex.Core/src/mineplex/core/titles/Titles.java index c0e221b42..0f739111e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/titles/Titles.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/titles/Titles.java @@ -38,6 +38,7 @@ import org.bukkit.Sound; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; +import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -750,6 +751,13 @@ public class Titles extends MiniDbClientPlugin implements IPacketHand if (packetInfo.getPacket() instanceof PacketPlayOutNamedEntitySpawn) { PacketPlayOutNamedEntitySpawn packet = (PacketPlayOutNamedEntitySpawn) packetInfo.getPacket(); + Entity entity = UtilEnt.getEntityById(packet.a); + + if (!(entity instanceof Player)) + { + return; + } + Player owner = (Player) UtilEnt.getEntityById(packet.a); if (_gadgetManager.getActive(owner, GadgetType.MORPH) == null) { From da2965480774e65732ca564dfb82aa68ecb34d6c Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 30 Mar 2017 19:06:55 +0100 Subject: [PATCH 61/91] April Fools Treasure Hunt --- .../core/aprilfools/AprilFoolsManager.java | 24 +- .../core/aprilfools/AprilFoolsRepository.java | 81 +++++ .../src/mineplex/core/npc/NpcManager.java | 17 +- .../core/titles/tracks/TrackManager.java | 2 + .../tracks/award/AprilFools2017Track.java | 30 ++ .../Mineplex.Hub/src/mineplex/hub/Hub.java | 40 +-- .../hub/modules/AprilFoolsTreasureHunt.java | 303 ++++++++++++++++++ 7 files changed, 451 insertions(+), 46 deletions(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/AprilFools2017Track.java create mode 100644 Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 64c4f6bda..284c7eb9e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -1,15 +1,14 @@ package mineplex.core.aprilfools; import com.google.common.collect.ImmutableMap; -import com.mojang.authlib.GameProfile; import mineplex.core.MiniPlugin; import mineplex.core.aprilfools.command.PirateSongCommand; import mineplex.core.common.Rank; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTextMiddle; +import mineplex.core.twofactor.TwoFactorAuth; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.core.utils.UtilGameProfile; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerChatEvent; @@ -86,31 +85,24 @@ public class AprilFoolsManager extends MiniPlugin .build(); private static AprilFoolsManager _instance; + private final AprilFoolsRepository _repository; + private final TwoFactorAuth _twoFA; private boolean _enabled; private boolean _enabledTitle; - private GameProfile _pirateSkin; - public AprilFoolsManager() { super("April Fools"); _instance = this; + _repository = new AprilFoolsRepository(); + _twoFA = require(TwoFactorAuth.class); setEnabled(true); _enabledTitle = UtilServer.isHubServer() || UtilServer.isTestServer(); if (_enabled) { - try - { - _pirateSkin = UtilGameProfile.getProfileByName("Moppletop", false, null).get(); - } - catch (Exception e) - { - e.printStackTrace(); - } - for (Map.Entry entry : RANK_REPLACEMENTS.entrySet()) { entry.getKey().setName(entry.getValue()); @@ -127,7 +119,7 @@ public class AprilFoolsManager extends MiniPlugin @EventHandler(priority = EventPriority.LOWEST) public void chat(AsyncPlayerChatEvent event) { - if (!_enabled) + if (!_enabled || _twoFA.isAuthenticating(event.getPlayer())) { return; } @@ -235,9 +227,9 @@ public class AprilFoolsManager extends MiniPlugin UtilTextMiddle.display("", message, 10, 40, 10); } - public GameProfile getPirateSkin() + public AprilFoolsRepository getRepository() { - return _pirateSkin; + return _repository; } public void setEnabled(boolean enabled) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java new file mode 100644 index 000000000..edc46fa6c --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java @@ -0,0 +1,81 @@ +package mineplex.core.aprilfools; + +import mineplex.core.account.CoreClient; +import mineplex.serverdata.database.DBPool; +import mineplex.serverdata.database.RepositoryBase; +import mineplex.serverdata.database.column.ColumnInt; +import mineplex.serverdata.database.column.ColumnVarChar; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + +public class AprilFoolsRepository extends RepositoryBase +{ + + private static final String GET_TREASURE = "SELECT * FROM aprilFools WHERE accountId=?;"; + private static final String INSERT_TREASURE = "INSERT INTO aprilFools VALUES (?,?);"; + private static final String UPDATE_TREASURE = "UPDATE aprilFools SET found=? WHERE accountId=?"; + private static final String DELIMITER = ":"; + + private final List _exists; + + public AprilFoolsRepository() + { + super(DBPool.getAccount()); + + _exists = new ArrayList<>(); + } + + public void getTreasure(Consumer> response, CoreClient client) + { + executeQuery(GET_TREASURE, resultSet -> + { + if (resultSet.next()) + { + List found = new ArrayList<>(); + + for (String s : resultSet.getString("found").split(DELIMITER)) + { + found.add(Integer.parseInt(s)); + } + + _exists.add(client.getAccountId()); + response.accept(found); + } + }, new ColumnInt("accountId", client.getAccountId())); + } + + public void saveTreasure(CoreClient client, List found) + { + int accountId = client.getAccountId(); + String foundString = ""; + + for (int i : found) + { + foundString += i + ":"; + } + + _exists.remove(Integer.valueOf(accountId)); + + if (exists(client)) + { + executeUpdate(UPDATE_TREASURE, + new ColumnVarChar("found", 80, foundString), + new ColumnInt("accountId", accountId) + ); + } + else + { + executeInsert(INSERT_TREASURE, null, + new ColumnInt("accountId", accountId), + new ColumnVarChar("found", 80, foundString) + ); + } + } + + public boolean exists(CoreClient client) + { + return _exists.contains(client.getAccountId()); + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java index 7ea920ad6..fc87a6a09 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java @@ -4,7 +4,9 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.*; +import com.mojang.authlib.GameProfile; import mineplex.core.aprilfools.AprilFoolsManager; +import mineplex.core.common.skin.SkinData; import mineplex.core.disguise.DisguiseManager; import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.utils.UtilGameProfile; @@ -303,15 +305,17 @@ public class NpcManager extends MiniPlugin public Entity spawnNpc(Npc npc) { LivingEntity entity = (LivingEntity) _creature.SpawnEntity(npc.getLocation(), EntityType.valueOf(npc.getDatabaseRecord().getEntityType())); + String name = null; if (npc.getDatabaseRecord().getName() == null) { entity.setCustomNameVisible(false); entity.setCustomName(ChatColor.RESET.toString()); + name = entity.getCustomName(); } else { - String name = npc.getDatabaseRecord().getName(); + name = npc.getDatabaseRecord().getName(); for (ChatColor color : ChatColor.values()) name = name.replace("(" + color.name().toLowerCase() + ")", color.toString()); name = ChatColor.translateAlternateColorCodes('&', name); @@ -370,17 +374,6 @@ public class NpcManager extends MiniPlugin npc.setEntity(entity); - // Disguise the npc if April Fools - AprilFoolsManager aprilFoolsManager = AprilFoolsManager.getInstance(); - if (aprilFoolsManager.isEnabled()) - { - DisguisePlayer playerDisguise = new DisguisePlayer(entity, aprilFoolsManager.getPirateSkin()); - - playerDisguise.setSendSkinDataToSelf(false); - - _disguise.disguise(playerDisguise); - } - return entity; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/TrackManager.java b/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/TrackManager.java index 7aac0b6b0..30072b414 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/TrackManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/TrackManager.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.function.Consumer; +import mineplex.core.titles.tracks.award.AprilFools2017Track; import net.md_5.bungee.api.ChatColor; import org.bukkit.Bukkit; @@ -80,6 +81,7 @@ public class TrackManager extends MiniPlugin // Awarded tracks registerTrack(new Bridges2017Track()); + registerTrack(new AprilFools2017Track()); // Custom tracks // registerTrack(track("lenny", "Lenny", "( ͡° ͜ʖ ͡°)")); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/AprilFools2017Track.java b/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/AprilFools2017Track.java new file mode 100644 index 000000000..4df96a59b --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/titles/tracks/award/AprilFools2017Track.java @@ -0,0 +1,30 @@ +package mineplex.core.titles.tracks.award; + +import mineplex.core.titles.tracks.ItemizedTrack; +import mineplex.core.titles.tracks.TrackFormat; +import mineplex.core.titles.tracks.TrackTier; +import net.md_5.bungee.api.ChatColor; + +public class AprilFools2017Track extends ItemizedTrack +{ + + public AprilFools2017Track() + { + super( + "aprilfools-2017", + ChatColor.LIGHT_PURPLE, + "Fools 2017", + "2017 April Fools Treasure Hunt", + "This track is awarded to players who found all the chests in the 2017 April Fools Event", + true); + + special(); + + getRequirements() + .addTier(new TrackTier( + "2017 April Fools", + null, + this::owns, + new TrackFormat(ChatColor.LIGHT_PURPLE, ChatColor.DARK_PURPLE) + )); } +} diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index 55f7b7b97..c21256ce4 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -2,6 +2,7 @@ package mineplex.hub; import static mineplex.core.Managers.require; +import mineplex.hub.modules.AprilFoolsTreasureHunt; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -117,7 +118,8 @@ public class Hub extends JavaPlugin implements IRelation // new ProfileCacheManager(this); ItemStackFactory.Initialize(this, false); Recharge.Initialize(this); - VisibilityManager.Initialize(this); Give.Initialize(this); + VisibilityManager.Initialize(this); + Give.Initialize(this); Punish punish = new Punish(this, clientManager); BlockRestore blockRestore = require(BlockRestore.class); DonationManager donationManager = require(DonationManager.class); @@ -132,9 +134,9 @@ public class Hub extends JavaPlugin implements IRelation DisguiseManager disguiseManager = require(DisguiseManager.class); IncognitoManager incognito = new IncognitoManager(this, clientManager, packetHandler); PreferencesManager preferenceManager = new PreferencesManager(this, incognito, clientManager); - + incognito.setPreferencesManager(preferenceManager); - + preferenceManager.GiveItem = true; Creature creature = new Creature(this); NpcManager npcManager = new NpcManager(this, creature); @@ -145,7 +147,7 @@ public class Hub extends JavaPlugin implements IRelation //new TournamentManager(this, clientManager, donationManager); ProjectileManager throwManager = new ProjectileManager(this); - + //Main Modules new TitanGiveawayManager(this, clientManager, serverStatusManager); @@ -159,9 +161,9 @@ public class Hub extends JavaPlugin implements IRelation guardianManager.registerGuardian(new AntiHackGuardian(new Location(Bukkit.getWorld("world"), 0, 100, 0), 50, -50, 105, 95, 50, -50)); } - IgnoreManager ignoreManager = new IgnoreManager(this, clientManager, preferenceManager, portal); + IgnoreManager ignoreManager = new IgnoreManager(this, clientManager, preferenceManager, portal); - FriendManager friendManager = new FriendManager(this, clientManager, preferenceManager, portal); + FriendManager friendManager = new FriendManager(this, clientManager, preferenceManager, portal); StatsManager statsManager = new StatsManager(this, clientManager); EloManager eloManager = new EloManager(this, clientManager); @@ -199,17 +201,14 @@ public class Hub extends JavaPlugin implements IRelation new SnapshotPlugin(this, snapshotManager, clientManager); new ReportPlugin(this, reportManager); - AprilFoolsManager.getInstance(); - new EternalGiveawayManager(this, clientManager, serverStatusManager); CombatManager combatManager = new CombatManager(this); - DamageManager damage = new DamageManager(this, combatManager, npcManager, disguiseManager, conditionManager); conditionManager.setDamageManager(damage); - + Fire fire = new Fire(this, conditionManager, damage); Teleport teleport = new Teleport(this, clientManager); Energy energy = new Energy(this); @@ -218,14 +217,14 @@ public class Hub extends JavaPlugin implements IRelation ItemFactory itemFactory = new ItemFactory(this, blockRestore, conditionManager, damage, energy, fire, throwManager); SkillFactory skillManager = new SkillFactory(this, damage, this, combatManager, conditionManager, throwManager, disguiseManager, blockRestore, fire, new Movement(this), teleport, energy); ClassManager classManager = new ClassManager(this, clientManager, donationManager, hubManager.GetGadget(), skillManager, itemFactory); - - ClassShopManager shopManager = new ClassShopManager(this, classManager, skillManager, itemFactory, achievementManager, clientManager); - - new ClassCombatShop(shopManager, clientManager, donationManager, false, "Brute", classManager.GetClass("Brute"), true); - new ClassCombatShop(shopManager, clientManager, donationManager, false, "Mage", classManager.GetClass("Mage"), true); - new ClassCombatShop(shopManager, clientManager, donationManager, false, "Ranger", classManager.GetClass("Ranger"), true); - new ClassCombatShop(shopManager, clientManager, donationManager, false, "Knight", classManager.GetClass("Knight"), true); - new ClassCombatShop(shopManager, clientManager, donationManager, false, "Assassin", classManager.GetClass("Assassin"), true); + + ClassShopManager shopManager = new ClassShopManager(this, classManager, skillManager, itemFactory, achievementManager, clientManager); + + new ClassCombatShop(shopManager, clientManager, donationManager, false, "Brute", classManager.GetClass("Brute"), true); + new ClassCombatShop(shopManager, clientManager, donationManager, false, "Mage", classManager.GetClass("Mage"), true); + new ClassCombatShop(shopManager, clientManager, donationManager, false, "Ranger", classManager.GetClass("Ranger"), true); + new ClassCombatShop(shopManager, clientManager, donationManager, false, "Knight", classManager.GetClass("Knight"), true); + new ClassCombatShop(shopManager, clientManager, donationManager, false, "Assassin", classManager.GetClass("Assassin"), true); //Updates getServer().getScheduler().scheduleSyncRepeatingTask(this, new Updater(this), 1, 1); @@ -238,6 +237,11 @@ public class Hub extends JavaPlugin implements IRelation require(TwoFactorAuth.class); require(TeamspeakManager.class); new WebsiteLinkManager(this, clientManager); + + if (AprilFoolsManager.getInstance().isEnabled()) + { + require(AprilFoolsTreasureHunt.class); + } } @Override diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java new file mode 100644 index 000000000..7d006d58f --- /dev/null +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java @@ -0,0 +1,303 @@ +package mineplex.hub.modules; + +import mineplex.core.MiniPlugin; +import mineplex.core.ReflectivelyCreateMiniPlugin; +import mineplex.core.account.CoreClientManager; +import mineplex.core.aprilfools.AprilFoolsManager; +import mineplex.core.common.currency.GlobalCurrency; +import mineplex.core.common.util.*; +import mineplex.core.donation.DonationManager; +import mineplex.core.inventory.InventoryManager; +import mineplex.core.titles.Titles; +import mineplex.core.titles.tracks.Track; +import mineplex.core.titles.tracks.TrackManager; +import mineplex.core.titles.tracks.award.AprilFools2017Track; +import mineplex.core.updater.UpdateType; +import mineplex.core.updater.event.UpdateEvent; +import org.bukkit.*; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.Skull; +import org.bukkit.entity.ArmorStand; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerQuitEvent; + +import java.util.*; + +@ReflectivelyCreateMiniPlugin +public class AprilFoolsTreasureHunt extends MiniPlugin +{ + + private static final int SHARD_REWARD = 500; + private static final String ITEM_REWARD = "Omega Chest"; + + private static final int[][] TREASURE = { + { + 0, 72, -10 + }, + { + -56, 71, -42 + }, + { + 171, 69, -67 + }, + { + 287, 71, -197 + }, + { + 306, 123, -182 + }, + { + 99, 68, -143 + }, + { + 122, 70, -27 + }, + { + 106, 86, 54 + }, + { + 48, 71, 71 + }, + { + 54, 64, 112 + }, + { + 45, 117, 113 + }, + { + 77, 93, 210 + }, + { + -13, 65, 128 + }, + { + -22, 65, 110 + }, + { + -115, 67, 54 + }, + { + -91, 56, 46 + }, + { + -14, 29, -10 + }, + { + 13, 39, 36 + }, + { + 99, 48, 49 + }, + { + -101, 70, 196 + }, + { + 29, 111, 39 + }, + { + 36, 60, -19 + }, + { + -65, 70, -111 + }, + { + -88, 55, -77 + }, + { + -4, 73, -37 + }, + { + 120, 68, -20 + }, + { + 119, 79, 9 + }, + { + 213, 64, -111 + }, + { + 228, 63, -155 + }, + { + 34, 84, -5 + } + }; + private static final BlockFace[] BLOCK_FACES = { + BlockFace.NORTH, + BlockFace.EAST, + BlockFace.SOUTH, + BlockFace.WEST, + BlockFace.NORTH_EAST, + BlockFace.SOUTH_EAST, + BlockFace.SOUTH_WEST, + BlockFace.NORTH_WEST + }; + + private final AprilFoolsManager _aprilFools; + private final CoreClientManager _client; + private final DonationManager _donation; + private final InventoryManager _inventory; + private final TrackManager _track; + + private final Map> _foundTreasure; + private final List _treasure; + private boolean _set; + + private ArmorStand _hologram; + private boolean _colour; + + private AprilFoolsTreasureHunt() + { + super("Treasure Hunt"); + + _aprilFools = require(AprilFoolsManager.class); + _client = require(CoreClientManager.class); + _donation = require(DonationManager.class); + _inventory = require(InventoryManager.class); + _track = require(TrackManager.class); + + _foundTreasure = new HashMap<>(); + _treasure = new ArrayList<>(TREASURE.length); + } + + @EventHandler + public void update(UpdateEvent event) + { + if (event.getType() != UpdateType.SEC || _hologram == null) + { + return; + } + + _hologram.setCustomName((_colour ? C.cPurpleB : C.cDPurpleB) + "April Fools Treasure Hunt"); + _colour = !_colour; + } + + @EventHandler + public void playerJoin(PlayerJoinEvent event) + { + UUID key = event.getPlayer().getUniqueId(); + + _foundTreasure.put(key, new ArrayList<>(TREASURE.length)); + + runAsync(() -> _aprilFools.getRepository().getTreasure(data -> _foundTreasure.put(key, data), _client.Get(key))); + + if (!_set) + { + _set = true; + World world = Bukkit.getWorld("world"); + + for (int[] cords : TREASURE) + { + Location location = new Location(world, cords[0], cords[1], cords[2]); + Block block = location.getBlock(); + block.setType(Material.SKULL); + block.setData((byte) 1); + Skull skull = (Skull) block.getState(); + skull.setSkullType(SkullType.PLAYER); + skull.setOwner("Moppletop"); + skull.setRotation(BLOCK_FACES[UtilMath.r(BLOCK_FACES.length)]); + skull.update(); + + _treasure.add(location); + } + + Location information = _treasure.get(0).clone(); + ArmorStand hologram = information.getWorld().spawn(information.add(.5, .5, .5), ArmorStand.class); + + hologram.setSmall(true); + hologram.setGravity(false); + hologram.setVisible(false); + hologram.setCustomNameVisible(true); + hologram.setRemoveWhenFarAway(false); + + _hologram = hologram; + } + } + + @EventHandler(priority = EventPriority.LOWEST) + public void playerQuit(PlayerQuitEvent event) + { + UUID key = event.getPlayer().getUniqueId(); + + runAsync(() -> _aprilFools.getRepository().saveTreasure(_client.Get(key), _foundTreasure.get(key))); + } + + @EventHandler + public void interactBlock(PlayerInteractEvent event) + { + if (event.getClickedBlock() == null) + { + return; + } + + Player player = event.getPlayer(); + UUID key = event.getPlayer().getUniqueId(); + List found = _foundTreasure.get(key); + Location location = event.getClickedBlock().getLocation(); + int i = 0; + + for (Location treasure : _treasure) + { + if (location.equals(treasure) && !found.contains(i)) + { + findChest(player, i); + } + + i++; + } + } + + private void findChest(Player player, int id) + { + List found = _foundTreasure.get(player.getUniqueId()); + + found.add(id); + player.playSound(player.getLocation(), Sound.CAT_MEOW, 1, 0.7F); + player.sendMessage(F.main(_moduleName, "Found " + F.count(String.valueOf(found.size())) + "/" + F.count(String.valueOf(_treasure.size()))) + " Treasure Chests +" + F.currency(GlobalCurrency.TREASURE_SHARD, SHARD_REWARD) + "."); + _donation.rewardCurrencyUntilSuccess(GlobalCurrency.TREASURE_SHARD, player, "", SHARD_REWARD); + + if (found.size() == 1) + { + player.sendMessage(F.main(_moduleName, "There are " + F.count("30") + " secret " + F.elem("Treasure Chests") + " to find through the lobby.")); + player.sendMessage(F.main(_moduleName, "Each one is worth " + F.currency(GlobalCurrency.TREASURE_SHARD, SHARD_REWARD) + ".")); + player.sendMessage(F.main(_moduleName, "If you find all " + F.count("30") + " you will receive an " + C.cAqua + "Omega Chest" + C.mBody + " and an exclusive " + F.elem("Title") + "!")); + } + + if (found.size() == TREASURE.length) + { + player.sendMessage(F.main(_moduleName, "Completed the " + F.name("Mineplex April Fools 2017 Treasure Hunt") + ".")); + + _inventory.addItemToInventory(data -> + { + if (data) + { + player.sendMessage(F.main(_moduleName, "+1 " + C.cAqua + ITEM_REWARD + C.mBody + "!")); + } + else + { + player.sendMessage(F.main(_moduleName, "Oops, somehow I could not give you the chest, you should inform a staff member!")); + } + }, player, ITEM_REWARD, 1); + + Track track = _track.getTrack(AprilFools2017Track.class); + + _track.unlockTrack(player, track, result -> + { + switch (result) + { + case UNKNOWN_ERROR: + player.sendMessage(F.main(_moduleName, "Oops, somehow I could not give you the title track, you should inform a staff member!")); + break; + case SUCCESS: + player.sendMessage(F.main(_moduleName, "Unlocked " + track.getColor() + track.getLongName() + C.mBody + " Title!")); + break; + } + }); + } + } +} From e71bab8ceabee871ea4b8eee00de93f9bbac7b97 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 31 Mar 2017 21:19:20 +0100 Subject: [PATCH 62/91] Use a better DB schema --- .../core/aprilfools/AprilFoolsRepository.java | 59 ++++--------------- .../hub/modules/AprilFoolsTreasureHunt.java | 51 ++++++---------- 2 files changed, 31 insertions(+), 79 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java index edc46fa6c..12c22628a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsRepository.java @@ -13,69 +13,36 @@ import java.util.function.Consumer; public class AprilFoolsRepository extends RepositoryBase { - private static final String GET_TREASURE = "SELECT * FROM aprilFools WHERE accountId=?;"; - private static final String INSERT_TREASURE = "INSERT INTO aprilFools VALUES (?,?);"; - private static final String UPDATE_TREASURE = "UPDATE aprilFools SET found=? WHERE accountId=?"; - private static final String DELIMITER = ":"; - - private final List _exists; + private static final String GET_TREASURE = "SELECT * FROM aprilFoolsTreasure WHERE accountId=?;"; + private static final String INSERT_TREASURE = "INSERT INTO aprilFoolsTreasure VALUES (?,?);"; public AprilFoolsRepository() { super(DBPool.getAccount()); - - _exists = new ArrayList<>(); } public void getTreasure(Consumer> response, CoreClient client) { executeQuery(GET_TREASURE, resultSet -> { - if (resultSet.next()) + List found = new ArrayList<>(); + + while (resultSet.next()) { - List found = new ArrayList<>(); - - for (String s : resultSet.getString("found").split(DELIMITER)) - { - found.add(Integer.parseInt(s)); - } - - _exists.add(client.getAccountId()); - response.accept(found); + found.add(resultSet.getInt("treasureId")); } + + response.accept(found); }, new ColumnInt("accountId", client.getAccountId())); } - public void saveTreasure(CoreClient client, List found) + public void saveTreasure(CoreClient client, int treasureId) { int accountId = client.getAccountId(); - String foundString = ""; - for (int i : found) - { - foundString += i + ":"; - } - - _exists.remove(Integer.valueOf(accountId)); - - if (exists(client)) - { - executeUpdate(UPDATE_TREASURE, - new ColumnVarChar("found", 80, foundString), - new ColumnInt("accountId", accountId) - ); - } - else - { - executeInsert(INSERT_TREASURE, null, - new ColumnInt("accountId", accountId), - new ColumnVarChar("found", 80, foundString) - ); - } - } - - public boolean exists(CoreClient client) - { - return _exists.contains(client.getAccountId()); + executeInsert(INSERT_TREASURE, null, + new ColumnInt("accountId", accountId), + new ColumnInt("treasureId", treasureId) + ); } } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java index 7d006d58f..88b6ae444 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java @@ -5,15 +5,14 @@ import mineplex.core.ReflectivelyCreateMiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.aprilfools.AprilFoolsManager; import mineplex.core.common.currency.GlobalCurrency; -import mineplex.core.common.util.*; +import mineplex.core.common.util.C; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilMath; import mineplex.core.donation.DonationManager; import mineplex.core.inventory.InventoryManager; -import mineplex.core.titles.Titles; import mineplex.core.titles.tracks.Track; import mineplex.core.titles.tracks.TrackManager; import mineplex.core.titles.tracks.award.AprilFools2017Track; -import mineplex.core.updater.UpdateType; -import mineplex.core.updater.event.UpdateEvent; import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; @@ -21,10 +20,8 @@ import org.bukkit.block.Skull; import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerQuitEvent; import java.util.*; @@ -149,7 +146,6 @@ public class AprilFoolsTreasureHunt extends MiniPlugin private boolean _set; private ArmorStand _hologram; - private boolean _colour; private AprilFoolsTreasureHunt() { @@ -165,18 +161,6 @@ public class AprilFoolsTreasureHunt extends MiniPlugin _treasure = new ArrayList<>(TREASURE.length); } - @EventHandler - public void update(UpdateEvent event) - { - if (event.getType() != UpdateType.SEC || _hologram == null) - { - return; - } - - _hologram.setCustomName((_colour ? C.cPurpleB : C.cDPurpleB) + "April Fools Treasure Hunt"); - _colour = !_colour; - } - @EventHandler public void playerJoin(PlayerJoinEvent event) { @@ -213,20 +197,13 @@ public class AprilFoolsTreasureHunt extends MiniPlugin hologram.setGravity(false); hologram.setVisible(false); hologram.setCustomNameVisible(true); + hologram.setCustomName(C.cDPurple + C.Scramble + "ABC " + C.cPurpleB + "April Fools Treasure Hunt" + C.cDPurple + C.Scramble + " ABC"); hologram.setRemoveWhenFarAway(false); _hologram = hologram; } } - @EventHandler(priority = EventPriority.LOWEST) - public void playerQuit(PlayerQuitEvent event) - { - UUID key = event.getPlayer().getUniqueId(); - - runAsync(() -> _aprilFools.getRepository().saveTreasure(_client.Get(key), _foundTreasure.get(key))); - } - @EventHandler public void interactBlock(PlayerInteractEvent event) { @@ -243,32 +220,40 @@ public class AprilFoolsTreasureHunt extends MiniPlugin for (Location treasure : _treasure) { - if (location.equals(treasure) && !found.contains(i)) + if (location.equals(treasure)) { findChest(player, i); + break; } i++; } } - private void findChest(Player player, int id) + private void findChest(Player player, int treasureId) { List found = _foundTreasure.get(player.getUniqueId()); - found.add(id); + if (found.contains(treasureId)) + { + player.sendMessage(F.main(_moduleName, "You already have found this skull!")); + return; + } + + found.add(treasureId); player.playSound(player.getLocation(), Sound.CAT_MEOW, 1, 0.7F); player.sendMessage(F.main(_moduleName, "Found " + F.count(String.valueOf(found.size())) + "/" + F.count(String.valueOf(_treasure.size()))) + " Treasure Chests +" + F.currency(GlobalCurrency.TREASURE_SHARD, SHARD_REWARD) + "."); _donation.rewardCurrencyUntilSuccess(GlobalCurrency.TREASURE_SHARD, player, "", SHARD_REWARD); + runAsync(() -> _aprilFools.getRepository().saveTreasure(_client.Get(player.getUniqueId()), treasureId)); + if (found.size() == 1) { - player.sendMessage(F.main(_moduleName, "There are " + F.count("30") + " secret " + F.elem("Treasure Chests") + " to find through the lobby.")); + player.sendMessage(F.main(_moduleName, "There are " + F.count("30") + " secret " + F.elem("Pirate Heads") + " to find through the lobby.")); player.sendMessage(F.main(_moduleName, "Each one is worth " + F.currency(GlobalCurrency.TREASURE_SHARD, SHARD_REWARD) + ".")); player.sendMessage(F.main(_moduleName, "If you find all " + F.count("30") + " you will receive an " + C.cAqua + "Omega Chest" + C.mBody + " and an exclusive " + F.elem("Title") + "!")); } - - if (found.size() == TREASURE.length) + else if (found.size() == TREASURE.length) { player.sendMessage(F.main(_moduleName, "Completed the " + F.name("Mineplex April Fools 2017 Treasure Hunt") + ".")); From 80eb8db8e2bdec036f220b4eaf64d536716760e5 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 31 Mar 2017 21:29:28 +0100 Subject: [PATCH 63/91] Remove unused global variable --- .../src/mineplex/hub/modules/AprilFoolsTreasureHunt.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java index 88b6ae444..10e0a73d1 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java @@ -145,8 +145,6 @@ public class AprilFoolsTreasureHunt extends MiniPlugin private final List _treasure; private boolean _set; - private ArmorStand _hologram; - private AprilFoolsTreasureHunt() { super("Treasure Hunt"); @@ -199,8 +197,6 @@ public class AprilFoolsTreasureHunt extends MiniPlugin hologram.setCustomNameVisible(true); hologram.setCustomName(C.cDPurple + C.Scramble + "ABC " + C.cPurpleB + "April Fools Treasure Hunt" + C.cDPurple + C.Scramble + " ABC"); hologram.setRemoveWhenFarAway(false); - - _hologram = hologram; } } From 5bba8d2a5bfbe04d99a18a9b8a688de0ba323100 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 31 Mar 2017 22:11:11 +0100 Subject: [PATCH 64/91] Show how many they have found when clicking on a head --- .../src/mineplex/hub/modules/AprilFoolsTreasureHunt.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java index 10e0a73d1..a4928e979 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java @@ -232,7 +232,6 @@ public class AprilFoolsTreasureHunt extends MiniPlugin if (found.contains(treasureId)) { - player.sendMessage(F.main(_moduleName, "You already have found this skull!")); return; } From 6adc1b265d766a731b52d4de02a1b8585a50cd58 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 31 Mar 2017 22:11:28 +0100 Subject: [PATCH 65/91] Missed a file... --- .../src/mineplex/hub/modules/AprilFoolsTreasureHunt.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java index a4928e979..3a6ed2997 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java @@ -232,6 +232,7 @@ public class AprilFoolsTreasureHunt extends MiniPlugin if (found.contains(treasureId)) { + player.sendMessage(F.main(_moduleName, "You already have found this skull! You have found " + F.count(String.valueOf(found.size())) + "/" + F.count(String.valueOf(_treasure.size())) + ".")); return; } From b88f9fc64277847eb5ed57f15053afa5d347f83b Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 1 Apr 2017 01:19:04 +0100 Subject: [PATCH 66/91] Change the skin to Topplemop --- .../src/mineplex/hub/modules/AprilFoolsTreasureHunt.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java index 3a6ed2997..0a8cc9bd2 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/AprilFoolsTreasureHunt.java @@ -181,7 +181,7 @@ public class AprilFoolsTreasureHunt extends MiniPlugin block.setData((byte) 1); Skull skull = (Skull) block.getState(); skull.setSkullType(SkullType.PLAYER); - skull.setOwner("Moppletop"); + skull.setOwner("Topplemop"); skull.setRotation(BLOCK_FACES[UtilMath.r(BLOCK_FACES.length)]); skull.update(); From ef21106da02577e23fd54911977d358e8c2744c6 Mon Sep 17 00:00:00 2001 From: samczsun Date: Sun, 19 Mar 2017 14:55:16 -0400 Subject: [PATCH 67/91] Fix memory leak in CompassModule --- .../src/mineplex/core/shop/page/ShopPageInventory.java | 4 +++- .../arcade/game/modules/compass/menu/CompassMenu.java | 9 +++++---- .../game/modules/compass/menu/page/CompassPage.java | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageInventory.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageInventory.java index 0546c0de6..1d631af56 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageInventory.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageInventory.java @@ -4,6 +4,8 @@ import mineplex.core.MiniPlugin; import mineplex.core.account.CoreClientManager; import mineplex.core.donation.DonationManager; import mineplex.core.itemstack.ItemBuilder; +import mineplex.core.lifetimes.Lifetime; +import mineplex.core.lifetimes.Lifetimed; import mineplex.core.shop.ShopBase; import mineplex.core.shop.item.IButton; @@ -12,7 +14,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; -public abstract class ShopPageInventory> extends +public abstract class ShopPageInventory> extends ShopPageBase { private int _page; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/CompassMenu.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/CompassMenu.java index 81114a0b8..2c11196c9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/CompassMenu.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/CompassMenu.java @@ -6,28 +6,29 @@ import mineplex.core.shop.ShopBase; import mineplex.core.shop.page.ShopPageBase; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.modules.compass.CompassModule; import nautilus.game.arcade.game.modules.compass.menu.page.CompassPage; -public class CompassMenu extends ShopBase +public class CompassMenu extends ShopBase { private CompassModule _compassModule; public CompassMenu(CompassModule module) { - super(module.getGame().getArcadeManager(), module.getGame().getArcadeManager().GetClients(), module.getGame().getArcadeManager().GetDonation(), "Spectate Menu"); + super(module.getGame(), module.getGame().getArcadeManager().GetClients(), module.getGame().getArcadeManager().GetDonation(), "Spectate Menu"); this._compassModule = module; } @Override - protected ShopPageBase> buildPagesFor(Player player) + protected ShopPageBase> buildPagesFor(Player player) { return new CompassPage(this, _compassModule, player); } public void update() { - for (ShopPageBase> shopPage : getPlayerPageMap().values()) + for (ShopPageBase> shopPage : getPlayerPageMap().values()) { shopPage.refresh(); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/page/CompassPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/page/CompassPage.java index c126adb79..a4f88d31a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/page/CompassPage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/compass/menu/page/CompassPage.java @@ -21,6 +21,7 @@ import mineplex.core.shop.item.ShopItem; import mineplex.core.shop.page.ShopPageInventory; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.modules.compass.CompassEntry; import nautilus.game.arcade.game.modules.compass.CompassModule; @@ -28,7 +29,7 @@ import nautilus.game.arcade.game.modules.compass.menu.CompassMenu; import nautilus.game.arcade.game.modules.compass.menu.button.CompassButton; public class CompassPage extends - ShopPageInventory + ShopPageInventory { private CompassModule _compassModule; private IButton[] _buttons; @@ -36,7 +37,7 @@ public class CompassPage extends public CompassPage(CompassMenu menu, CompassModule compassModule, Player player) { - super(compassModule.getGame().getArcadeManager(), + super(compassModule.getGame(), menu, compassModule.getGame().getArcadeManager().GetClients(), compassModule.getGame().getArcadeManager().GetDonation(), From 653456189333304768af5a997a2fc8723044d310 Mon Sep 17 00:00:00 2001 From: cnr Date: Sat, 1 Apr 2017 23:59:47 -0500 Subject: [PATCH 68/91] Disable April Fools manager --- .../src/mineplex/core/aprilfools/AprilFoolsManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java index 284c7eb9e..1eb6ee28f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/aprilfools/AprilFoolsManager.java @@ -21,7 +21,7 @@ public class AprilFoolsManager extends MiniPlugin /** * Manually can be toggled to enable or disable the April Fools activities. */ - private static final boolean ENABLED = true; + private static final boolean ENABLED = false; private static final Map CHAT_REPLACEMENTS = ImmutableMap.builder() .put("you", "ye") From 1f1ad4c4415159e4835362bcdd29458015fde399 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 5 Apr 2017 21:35:04 +0100 Subject: [PATCH 69/91] Change Diamond ore drops to diamonds --- .../src/nautilus/game/arcade/game/games/bridge/Bridge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d26106512..1cc71d1e4 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 @@ -1083,7 +1083,7 @@ public class Bridge extends TeamGame implements OreObsfucation event.setSpawnDrop(false); event.getBlock().setType(Material.AIR); - Item item = event.getBlock().getWorld().dropItem(event.getBlock().getLocation().add(.5, .5, .5), new ItemStack(Material.DIAMOND_ORE)); + Item item = event.getBlock().getWorld().dropItem(event.getBlock().getLocation().add(.5, .5, .5), new ItemStack(Material.DIAMOND)); item.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), event.getPlayer().getUniqueId())); } From 047ed81eeae6be32b40774b46c1ac14f3cd43cc6 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 5 Apr 2017 21:38:04 +0100 Subject: [PATCH 70/91] Add a message when a player dies pregame --- .../src/nautilus/game/arcade/game/games/bridge/Bridge.java | 1 + 1 file changed, 1 insertion(+) 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 1cc71d1e4..3fb8e64c9 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 @@ -1640,6 +1640,7 @@ public class Bridge extends TeamGame implements OreObsfucation _usedLife.add(player.getName()); UtilPlayer.message(player, F.main("Game", "You used your " + F.elem(C.cAqua + "Early Game Revive") + ".")); + UtilServer.broadcast(F.main("Game", F.elem(player.getName() + " fell into the void."))); player.setFallDistance(0); GetTeam(player).SpawnTeleport(player); From c1b83b1065101f71ef1ab59d6b379874991c806f Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 5 Apr 2017 21:46:22 +0100 Subject: [PATCH 71/91] Braces --- .../src/nautilus/game/arcade/game/games/bridge/Bridge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3fb8e64c9..822d12038 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 @@ -1640,7 +1640,7 @@ public class Bridge extends TeamGame implements OreObsfucation _usedLife.add(player.getName()); UtilPlayer.message(player, F.main("Game", "You used your " + F.elem(C.cAqua + "Early Game Revive") + ".")); - UtilServer.broadcast(F.main("Game", F.elem(player.getName() + " fell into the void."))); + UtilServer.broadcast(F.main("Game", F.elem(player.getName()) + " fell into the void.")); player.setFallDistance(0); GetTeam(player).SpawnTeleport(player); From cbf7985773a868389918da41e4676919747961fc Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 5 Apr 2017 22:58:06 +0100 Subject: [PATCH 72/91] Colour the message --- .../src/nautilus/game/arcade/game/games/bridge/Bridge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 822d12038..6a6d7b56c 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 @@ -1640,7 +1640,7 @@ public class Bridge extends TeamGame implements OreObsfucation _usedLife.add(player.getName()); UtilPlayer.message(player, F.main("Game", "You used your " + F.elem(C.cAqua + "Early Game Revive") + ".")); - UtilServer.broadcast(F.main("Game", F.elem(player.getName()) + " fell into the void.")); + UtilServer.broadcast(F.main("Game", GetTeam(player).GetColor() + player.getName()) + C.cGray + " fell into the void."); player.setFallDistance(0); GetTeam(player).SpawnTeleport(player); From 64d5fe3c80afe5db6212453e71b2f0743fae2ddd Mon Sep 17 00:00:00 2001 From: cnr Date: Thu, 6 Apr 2017 00:33:41 -0500 Subject: [PATCH 73/91] Revert "Revert "Merge branch update/bridges into develop"" This reverts commit 0ad69ebefc3107a69d6eb6980a479437f800f371. --- .../core/common/util/UtilParticle.java | 5 +- .../game/games/bridge/BattleCryManager.java | 6 - .../game/arcade/game/games/bridge/Bridge.java | 748 +++++++----------- .../bridge/animation/BridgeAnimation.java | 45 ++ .../bridge/animation/BridgeAnimationType.java | 44 ++ .../bridge/animation/IceBridgeAnimation.java | 79 ++ .../bridge/animation/LavaBridgeAnimation.java | 84 ++ .../animation/LillyPadBridgeAnimation.java | 65 ++ .../animation/MushroomBridgeAnimation.java | 107 +++ .../bridge/animation/WoodBridgeAnimation.java | 129 +++ .../custom/CustomBridgeAnimation.java | 246 ++++++ .../custom/RadiusCustomBridgeAnimation.java | 58 ++ .../custom/RandomCustomBridgeAnimation.java | 44 ++ .../game/games/bridge/kits/KitApple.java | 2 +- .../game/games/bridge/kits/KitArcher.java | 2 +- .../game/games/bridge/kits/KitBerserker.java | 2 +- .../game/games/bridge/kits/KitDestructor.java | 2 +- .../games/bridge/modes/OverpoweredBridge.java | 36 +- .../game/arcade/game/modules/Module.java | 3 - .../game/modules/WorldBorderModule.java | 116 +++ .../game/arcade/kit/ProgressingKit.java | 8 + .../game/arcade/kit/perks/PerkDestructor.java | 4 +- .../arcade/stats/DeathBomberStatTracker.java | 22 +- .../stats/FoodForTheMassesStatTracker.java | 6 + 24 files changed, 1339 insertions(+), 524 deletions(-) delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/BattleCryManager.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimationType.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/IceBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LavaBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LillyPadBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/MushroomBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/WoodBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RandomCustomBridgeAnimation.java create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/WorldBorderModule.java diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java index 0945ad7fd..7b85b4971 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java @@ -372,11 +372,12 @@ public class UtilParticle int count, ViewDist dist, Player... players) { PacketPlayOutWorldParticles packet = getPacket(particle, location, offsetX, offsetY, offsetZ, speed, count, true); - + int distValue = dist.getDist() * dist.getDist(); + for (Player player : players) { // Out of range for player - if (UtilMath.offset(player.getLocation(), location) > dist.getDist()) + if (UtilMath.offsetSquared(player.getLocation(), location) > distValue) continue; UtilPlayer.sendPacket(player, packet); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/BattleCryManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/BattleCryManager.java deleted file mode 100644 index 7c7e71ba0..000000000 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/BattleCryManager.java +++ /dev/null @@ -1,6 +0,0 @@ -package nautilus.game.arcade.game.games.bridge; - -public class BattleCryManager -{ - -} 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 a6d5d92f3..91bf17b99 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 @@ -1,6 +1,5 @@ package nautilus.game.arcade.game.games.bridge; -import com.google.common.collect.Lists; import mineplex.core.common.Rank; import mineplex.core.common.util.*; import mineplex.core.common.util.UtilEvent.ActionType; @@ -13,17 +12,28 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; -import nautilus.game.arcade.events.PlayerDeathOutEvent; +import nautilus.game.arcade.game.DebugCommand; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; +import nautilus.game.arcade.game.games.bridge.animation.BridgeAnimation; +import nautilus.game.arcade.game.games.bridge.animation.BridgeAnimationType; +import nautilus.game.arcade.game.games.bridge.animation.custom.CustomBridgeAnimation; +import nautilus.game.arcade.game.games.bridge.animation.custom.RadiusCustomBridgeAnimation; +import nautilus.game.arcade.game.games.bridge.animation.custom.RandomCustomBridgeAnimation; import nautilus.game.arcade.game.games.bridge.kits.*; +import nautilus.game.arcade.game.modules.WorldBorderModule; import nautilus.game.arcade.game.modules.compass.CompassModule; import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.kit.Perk; +import nautilus.game.arcade.kit.perks.PerkDestructor; import nautilus.game.arcade.ore.OreHider; import nautilus.game.arcade.ore.OreObsfucation; import nautilus.game.arcade.stats.*; -import org.bukkit.*; +import org.bukkit.Effect; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Chest; @@ -38,14 +48,19 @@ import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.entity.ItemSpawnEvent; +import org.bukkit.event.inventory.CraftItemEvent; import org.bukkit.event.inventory.PrepareItemCraftEvent; -import org.bukkit.event.player.*; +import org.bukkit.event.player.PlayerBucketEmptyEvent; +import org.bukkit.event.player.PlayerBucketFillEvent; +import org.bukkit.event.player.PlayerInteractEvent; +import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.inventory.CraftingInventory; import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.util.Vector; import java.util.*; +import java.util.concurrent.TimeUnit; public class Bridge extends TeamGame implements OreObsfucation { @@ -54,29 +69,24 @@ public class Bridge extends TeamGame implements OreObsfucation */ private static final Material[] PLAYER_DROP_DELAY_MATERIALS = new Material[] { Material.LOG, Material.LOG_2, Material.IRON_ORE, Material.DIAMOND_ORE, Material.COAL_ORE, Material.GOLD_ORE, Material.WORKBENCH, Material.FURNACE }; - //Bridge Timer - private int _bridgeTime = 600000; + /** + * The number of milliseconds from the game start time til the bridges should be built. + */ + private static final long BRIDGE_TIME = TimeUnit.MINUTES.toMillis(10); + + /** + * The number of ticks after the prepare state that we wait before setting the world border for the players. Just to make sure they are in the correct world. + */ + private static final int WORLD_BORDER_PREPARE_TICKS = 20; + + private static final String CUSTOM_BRIDGE_KEY = "TYPE"; + + //Bridge + private long _bridgeTime = BRIDGE_TIME; private boolean _bridgesDown = false; - - //Wood Bridge - private ArrayList _woodBridge = new ArrayList(); - private HashMap _woodBridgeBlocks = null; - - //Lava Bridge - private ArrayList _lavaBridge = new ArrayList(); - private ArrayList _lavaSource = new ArrayList(); - - //Lilly Pad Bridge - private NautHashMap _lillyPads = new NautHashMap(); + private BridgeAnimation _animation; + private CustomBridgeAnimation[] _customAnimations; - //Mushrooms - private NautHashMap _mushroomStem = new NautHashMap(); - private NautHashMap _mushroomTop = new NautHashMap(); - private boolean _stemsGrown = false; - - //Ice - private ArrayList _iceBridge = new ArrayList(); - private HashSet _bridgeParts = new HashSet(); //Animals @@ -97,14 +107,14 @@ public class Bridge extends TeamGame implements OreObsfucation private int _buildHeight = -1; //Player Respawn - private HashSet _usedLife = new HashSet(); + private Set _usedLife = new HashSet<>(); //Tourney Mode private boolean _tournament; private HashMap _tournamentKills = new HashMap(); private long _tournamentKillMessageTimer = 0; - + @SuppressWarnings("unchecked") public Bridge(ArcadeManager manager) { this(manager, GameType.Bridge); @@ -154,36 +164,14 @@ public class Bridge extends TeamGame implements OreObsfucation "The last team alive wins!" }); - List kits = Lists.newArrayList(GetKits()); - List finalKits = Lists.newArrayList(kits); - - boolean foundBrawler = false; - for(int i = 0; i < kits.size(); i++) - { - Kit kit = kits.get(i); - if(kit.GetName().equalsIgnoreCase("Brawler")) - { - if(!foundBrawler) - { - foundBrawler = true; - } - else - { - finalKits.remove(i); - } - } - } - - setKits(finalKits.toArray(new Kit[finalKits.size()])); - _ore = new OreHider(); // Flags - GameTimeout = Manager.IsTournamentServer() ? 5400000 : 3600000; + GameTimeout = Manager.IsTournamentServer() ? TimeUnit.MINUTES.toMillis(90) : TimeUnit.MINUTES.toMillis(60); Manager.GetExplosion().SetLiquidDamage(false); - this.StrictAntiHack = true; + StrictAntiHack = true; DamageSelf = true; @@ -206,10 +194,6 @@ public class Bridge extends TeamGame implements OreObsfucation WorldWaterDamage = 0; WorldBoundaryKill = false; - new CompassModule() - .setGiveCompassToAlive(true) - .register(this); - DeathDropItems = true; GemMultiplier = 2.5; @@ -229,35 +213,108 @@ public class Bridge extends TeamGame implements OreObsfucation "Killing yourself counts as -1 team kill.", "Team with the most kills wins!" }; + + _tournament = true; } - - _tournament = Manager.IsTournamentServer(); + _customAnimations = new CustomBridgeAnimation[] { + new RandomCustomBridgeAnimation(this), + new RadiusCustomBridgeAnimation(this) + }; + + new CompassModule() + .setGiveCompassToAlive(true) + .register(this); + + new WorldBorderModule().register(this); + + // So that we can be 110% sure + for (Kit kit : GetKits()) + { + if (kit instanceof KitDestructor) + { + for (Perk perk : kit.GetPerks()) + { + ((PerkDestructor) perk).setEnabled(false); + break; + } + + break; + } + } + + registerDebugCommand(new DebugCommand("bridge", Rank.ADMIN) + { + + @Override + public void Execute(Player caller, String[] args) + { + caller.sendMessage(F.main("Debug", "Spawning the bridges.")); + _bridgeTime = 3000; + } + }); + + registerDebugCommand(new DebugCommand("bridgeinfo", getArcadeManager().getGameCommandRank()) + { + + @Override + public void Execute(Player caller, String[] args) + { + if (_animation == null || !(_animation instanceof CustomBridgeAnimation)) + { + caller.sendMessage(F.main("Debug", "The bridge animation for this map isn't a custom one.")); + return; + } + + caller.sendMessage(F.main("Debug", "Bridge Info:")); + caller.sendMessage(_animation.toString()); + } + }); } @EventHandler - public void PlayerOut(final PlayerDeathOutEvent event) + public void prepare(GameStateChangeEvent event) { - if (_bridgesDown) - return; - - Player player = event.GetPlayer(); - - if (!_usedLife.contains(player.getName())) + if (event.GetState() != GameState.Prepare) { - _usedLife.add(player.getName()); - - UtilPlayer.message(player, F.main("Game", "You used your " + F.elem(C.cAqua + "Early Game Revive") + ".")); - - event.setCancelled(true); + return; } - } + + //Delay this so that we are 100% sure people are in the world. + Manager.runSyncLater(() -> { + + WorldBorderModule borderModule = getModule(WorldBorderModule.class); + + // Here we do some calculations for per player world borders + for (GameTeam team : GetTeamList()) + { + // Step 1 - Get the average location of the spawns, we assume this is generally in an OK position. + Location center = UtilAlg.getAverageLocation(team.GetSpawns()); + // Step 1.5 - Move the location back a bit from the centre, this is usually because spawns are on the inside edge of the islands. + center.add(UtilAlg.getTrajectory(SpectatorSpawn, center).multiply(15)); + + // Step 2 - Calculate an estimate for the size of the border. We'll go with half but the setSize uses the radius so it works out the same to leave it like this + double distToCenter = UtilMath.offset2d(SpectatorSpawn, center) * 0.9; + // Step 3 - Send the setCenter and setSize packets to the team members + for (Player player : team.GetPlayers(true)) + { + borderModule.setCenter(player, center); + borderModule.setSize(player, distToCenter); + } + + } + + }, WORLD_BORDER_PREPARE_TICKS); + } + @EventHandler(priority = EventPriority.MONITOR) - public void GameStateChange(GameStateChangeEvent event) + public void live(GameStateChangeEvent event) { if (event.GetState() != GameState.Live) + { return; + } if (!WorldData.GetCustomLocs("WATER_DAMAGE").isEmpty()) { @@ -266,24 +323,72 @@ public class Bridge extends TeamGame implements OreObsfucation if (WorldWaterDamage > 0) { - if (WorldData.MapName.equals("Volcanic Islands")) + String name = WorldData.MapName; + + if (name.equals("Volcanic Islands")) + { UtilTextMiddle.display(C.cRed + "Warning", "Water is Boiling Hot", 10, 60, 20); + } else if (WorldData.MapName.equals("Icelands")) + { UtilTextMiddle.display(C.cRed + "Warning", "Water is Freezing Cold", 10, 60, 20); + } else + { UtilTextMiddle.display(C.cRed + "Warning", "Water is Deadly", 10, 60, 20); + } } } - //parse @Override public void ParseData() { - ParseLavaBridge(); - ParseWoodBridge(); - ParseIceBridge(); - ParseLillyPad(); - ParseMushrooms(); + // Now we need to decide on what bridge animation. + typeLoop : for (BridgeAnimationType type : BridgeAnimationType.values()) + { + for (String colours : type.getColoursUsed()) + { + if (WorldData.GetDataLocs(colours).isEmpty()) + { + continue typeLoop; + } + } + + _animation = type.createInstance(this); + break; + } + + // If none of the premade ones are usable then we need a custom one! + if (_animation == null) + { + locationLoop : for (String key : WorldData.GetAllCustomLocs().keySet()) + { + if (!key.startsWith(CUSTOM_BRIDGE_KEY)) + { + continue; + } + + String[] split = key.split(" "); + + if (split.length < 2) + { + continue; + } + + String subKey = split[1]; + + for (CustomBridgeAnimation animation : _customAnimations) + { + if (animation.getTypeKey().equalsIgnoreCase(subKey)) + { + _animation = animation; + break locationLoop; + } + } + } + } + + _animation.onParse(); ParseChests(); @@ -403,8 +508,6 @@ public class Bridge extends TeamGame implements OreObsfucation } } - - public void ParseOre(ArrayList teamOre) { int coal = (int) ((teamOre.size() / 32d) * _oreDensity); @@ -625,368 +728,45 @@ public class Bridge extends TeamGame implements OreObsfucation } } - protected void ParseWoodBridge() { - _woodBridge = new ArrayList(); - - // Load Wood In - for (Location loc : WorldData.GetDataLocs("BROWN")) { - _woodBridge.add(loc.getBlock().getLocation()); - } - - for (Location loc : WorldData.GetDataLocs("GRAY")) { - _woodBridge.add(loc.getBlock().getLocation()); - _woodBridge.add(loc.getBlock().getRelative(BlockFace.UP) - .getLocation()); - } - - // Determine Wood Block - _woodBridgeBlocks = new HashMap(); - - for (Location loc : _woodBridge) { - if (_woodBridge.contains(loc.getBlock().getRelative(BlockFace.DOWN) - .getLocation())) { - _woodBridgeBlocks.put(loc, 85); - } - - if (_woodBridge.contains(loc.getBlock().getRelative(BlockFace.UP) - .getLocation())) { - _woodBridgeBlocks.put(loc, 17); - } - - if (!_woodBridgeBlocks.containsKey(loc)) { - _woodBridgeBlocks.put(loc, 126); - } - } - } - - protected void ParseLavaBridge() { - for (Location loc : WorldData.GetDataLocs("RED")) { - _lavaBridge.add(loc.getBlock().getLocation()); - } - - for (Location loc : WorldData.GetDataLocs("ORANGE")) { - _lavaBridge.add(loc.getBlock().getLocation()); - _lavaBridge.add(loc.getBlock().getRelative(BlockFace.UP) - .getLocation()); - } - - _lavaSource = WorldData.GetDataLocs("BLACK"); - } - - protected void ParseIceBridge() - { - _iceBridge = WorldData.GetDataLocs("LIGHT_BLUE"); - } - - protected void ParseMushrooms() - { - for (Location loc : WorldData.GetCustomLocs("21")) - { - _mushroomStem.put(loc, 0L); - loc.getBlock().setType(Material.AIR); - } - - for (Location loc : WorldData.GetDataLocs("PURPLE")) - { - _mushroomTop.put(loc, 0L); - } - } - - protected void ParseLillyPad() - { - for (Location loc : WorldData.GetDataLocs("LIME")) - { - _lillyPads.put(loc, 0L); - } - } - @EventHandler - public void BridgeBuild(UpdateEvent event) + public void BridgeBuild(UpdateEvent event) { - if (!IsLive()) + if (!IsLive() || !UtilTime.elapsed(GetStateTime(), _bridgeTime)) + { return; + } - if (event.getType() != UpdateType.FASTEST) - return; + if (_animation != null) + { + _animation.onUpdate(event.getType()); + } - if (!UtilTime.elapsed(this.GetStateTime(), _bridgeTime)) + if (event.getType() != UpdateType.FAST) + { return; + } if (!_bridgesDown) { + _bridgesDown = true; + + WorldBorderModule borderModule = getModule(WorldBorderModule.class); + + for (Player player : GetPlayers(true)) + { + borderModule.setSize(player, 10000); + } + Manager.GetExplosion().SetLiquidDamage(true); - this.Announce(C.cRed + C.Bold + "ALERT: " + ChatColor.RESET + C.Bold + "THE BRIDGES ARE SPAWNING!"); - } + Announce(C.cRedB + "ALERT: " + C.Reset + C.Bold + "THE BRIDGES ARE SPAWNING!"); + UtilTextMiddle.display(C.cRedB + "ALERT", "The BRIDGES ARE SPAWNING!"); - _bridgesDown = true; - - for (Kit kit : this.GetKits()) - { - if (kit instanceof KitDestructor) + for (Kit kit : GetKits()) { - ((KitDestructor)kit).SetEnabled(true); - } - } - - BuildWood(); - BuildLava(); - BuildIce(); - BuildLillyPad(); - buildMushroom(); - } - - protected void BuildLava() - { - for (int i = 0; i < 3; i++) - if (_lavaBridge != null && _lavaSource != null - && !_lavaBridge.isEmpty() && !_lavaSource.isEmpty()) { - // Random Block - Location bestLoc = _lavaBridge.get(UtilMath.r(_lavaBridge - .size())); - - if (bestLoc.getBlock().getRelative(BlockFace.DOWN) - .isLiquid()) - continue; - - _lavaBridge.remove(bestLoc); - - Location source = _lavaSource.get(UtilMath.r(_lavaSource - .size())); - - // Create Part - FallingBlock block = bestLoc.getWorld().spawnFallingBlock( - source, 87, (byte) 0); - BridgePart part = new BridgePart(block, bestLoc, true); - _bridgeParts.add(part); - - // Sound - source.getWorld().playSound(source, Sound.EXPLODE, - 5f * (float) Math.random(), - 0.5f + (float) Math.random()); - } - } - - protected void BuildLillyPad() - { - for (int i = 0; i < 3; i++) - if (_lillyPads != null && !_lillyPads.isEmpty()) - { - // Random Block - Location loc = UtilAlg.Random(_lillyPads.keySet()); - - if (!UtilTime.elapsed(_lillyPads.get(loc), 8000)) - continue; - - if (!loc.getBlock().getRelative(BlockFace.DOWN).isLiquid()) - continue; - - _lillyPads.remove(loc); - - MapUtil.QuickChangeBlockAt(loc, Material.WATER_LILY); - - // Sound - loc.getWorld().playEffect(loc, Effect.STEP_SOUND, 111); - } - } - - @EventHandler - public void breakLillyPad(BlockBreakEvent event) - { - if (event.getBlock().getType() != Material.WATER_LILY) - return; - - _lillyPads.put(event.getBlock().getLocation(), System.currentTimeMillis() + (long)(Math.random() * 12000)); - } - - protected void buildMushroom() - { - if (_mushroomStem != null && !_mushroomStem.isEmpty()) - { - for (int i=0 ; i<4 && !_mushroomStem.isEmpty() ; i++) - { - double lowestY = 0; - Location lowestLoc = null; - - for (Location loc : _mushroomStem.keySet()) + if (kit instanceof KitDestructor) { - if (!UtilTime.elapsed(_mushroomStem.get(loc), 6000)) - continue; - - if (lowestLoc == null || loc.getY() < lowestY) - { - lowestY = loc.getY(); - lowestLoc = loc; - } + ((KitDestructor) kit).SetEnabled(true); } - - if (lowestLoc == null) - continue; - - _mushroomStem.remove(lowestLoc); - - MapUtil.QuickChangeBlockAt(lowestLoc, 100, (byte)15); - } - } - else - { - _stemsGrown = true; - } - - if (_stemsGrown && _mushroomTop != null && !_mushroomTop.isEmpty()) - { - int attempts = 0; - int done = 0; - while (done < 6 && attempts < 400) - { - attempts++; - - // Random Block - Location loc = UtilAlg.Random(_mushroomTop.keySet()); - - if (!UtilTime.elapsed(_mushroomTop.get(loc), 6000)) - continue; - - Block block = loc.getBlock(); - - if (block.getRelative(BlockFace.DOWN).getType() == Material.AIR && - block.getRelative(BlockFace.NORTH).getType() == Material.AIR && - block.getRelative(BlockFace.EAST).getType() == Material.AIR && - block.getRelative(BlockFace.SOUTH).getType() == Material.AIR && - block.getRelative(BlockFace.WEST).getType() == Material.AIR) - continue; - - _mushroomTop.remove(loc); - - MapUtil.QuickChangeBlockAt(block.getLocation(), 99, (byte)14); - - done++; - } - } - } - - @EventHandler - public void breakMushroom(BlockBreakEvent event) - { - if (event.isCancelled()) - return; - - - if (event.getBlock().getTypeId() == 100 && - WorldData.GetCustomLocs("21").contains(event.getBlock().getLocation().add(0.5, 0, 0.5))) - { - event.setCancelled(true); - event.getBlock().setType(Material.AIR); - - _mushroomStem.put(event.getBlock().getLocation(), System.currentTimeMillis() + (long)(Math.random() * 12000)); - } - - if (event.getBlock().getTypeId() == 99 && - WorldData.GetDataLocs("PURPLE").contains(event.getBlock().getLocation().add(0.5, 0, 0.5))) - { - event.setCancelled(true); - event.getBlock().setType(Material.AIR); - - _mushroomTop.put(event.getBlock().getLocation(), System.currentTimeMillis() + (long)(Math.random() * 12000)); - } - } - - protected void BuildIce() - { - if (_iceBridge == null || _iceBridge.isEmpty() || UtilTime.elapsed(this.GetStateTime(), _bridgeTime + 120000)) - { - WorldData.World.setStorm(false); - return; - } - - WorldData.World.setStorm(true); - - int attempts = 0; - int done = 0; - while (done < 5 && attempts < 400) - { - attempts++; - - // Random Block - Location loc = _iceBridge.get(UtilMath.r(_iceBridge.size())); - - Block block = loc.getBlock().getRelative(BlockFace.DOWN); - - if (!block.isLiquid()) - continue; - - if (block.getRelative(BlockFace.NORTH).isLiquid() && - block.getRelative(BlockFace.EAST).isLiquid() && - block.getRelative(BlockFace.SOUTH).isLiquid() && - block.getRelative(BlockFace.WEST).isLiquid()) - continue; - - _iceBridge.remove(loc); - - if (Math.random() > 0.25) - MapUtil.QuickChangeBlockAt(block.getLocation(), Material.PACKED_ICE); - else - MapUtil.QuickChangeBlockAt(block.getLocation(), Material.ICE); - - done++; - } - } - - protected void BuildWood() - { - if (_woodBridgeBlocks != null && !_woodBridgeBlocks.isEmpty()) - { - ArrayList toDo = new ArrayList(); - - BlockFace[] faces = new BlockFace[] { BlockFace.NORTH, - BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST }; - - for (Location loc : _woodBridgeBlocks.keySet()) - { - if (_woodBridgeBlocks.get(loc) == 17) - { - int adjacent = 0; - - for (BlockFace face : faces) - if (loc.getBlock().getRelative(face).getTypeId() != 0) - adjacent++; - - if (adjacent > 0) - toDo.add(loc); - - } else if (_woodBridgeBlocks.get(loc) == 85) - { - if (loc.getBlock().getRelative(BlockFace.DOWN).getTypeId() == 0) - continue; - - toDo.add(loc); - } else if (_woodBridgeBlocks.get(loc) == 126) - { - int adjacent = 0; - - for (BlockFace face : faces) - if (loc.getBlock().getRelative(face).getTypeId() != 0) - adjacent++; - - if (adjacent > 0) - toDo.add(loc); - } - } - - if (toDo.size() == 0) - return; - - for (Location loc : toDo) - { - int id = _woodBridgeBlocks.remove(loc); - - Location source = loc.clone().add(0, 30, 0); - - // Create Part - FallingBlock block = loc.getWorld().spawnFallingBlock(source, - id, (byte) 0); - block.setVelocity(new Vector(0, -1, 0)); - BridgePart part = new BridgePart(block, loc, false); - _bridgeParts.add(part); } } } @@ -1106,7 +886,7 @@ public class Bridge extends TeamGame implements OreObsfucation while (!UtilBlock.airFoliage(block)) { block = block.getRelative(BlockFace.UP); - + if (block.getY() >= 256) break; } @@ -1119,15 +899,15 @@ public class Bridge extends TeamGame implements OreObsfucation break; } - block = block.getRelative(BlockFace.UP); - - if (block.getTypeId() == 0) + if (block.getType() != Material.SNOW) { - if (Math.random() > 0.5) - block.setTypeId(39); - else - block.setTypeId(40); + block = block.getRelative(BlockFace.UP); } + + if (Math.random() > 0.5) + block.setTypeId(39); + else + block.setTypeId(40); } } @@ -1515,7 +1295,7 @@ public class Bridge extends TeamGame implements OreObsfucation else { Scoreboard.write(C.cYellow + C.Bold + "Time Left"); - Scoreboard.write(UtilTime.MakeStr(5400000 - (System.currentTimeMillis() - this.GetStateTime()), 0)); + Scoreboard.write(UtilTime.MakeStr(GameTimeout - (System.currentTimeMillis() - GetStateTime()), 0)); } Scoreboard.draw(); @@ -1681,7 +1461,7 @@ public class Bridge extends TeamGame implements OreObsfucation { _tournamentKillMessageTimer = System.currentTimeMillis(); - this.Announce(C.cRed + C.Bold + "ALERT: " + ChatColor.RESET + C.Bold + "FIRST TEAM TO HAVE MOST KILLS WINS!"); + Announce(C.cRed + C.Bold + "ALERT: " + C.Reset + C.Bold + "FIRST TEAM TO HAVE MOST KILLS WINS!"); } } @@ -1874,23 +1654,32 @@ public class Bridge extends TeamGame implements OreObsfucation } } - // @EventHandler - // public void liquidBlockDeny(BlockBreakEvent event) - // { - // if (_bridgesDown) - // return; - // - // if (!IsAlive(event.getPlayer())) - // return; - // - // if (event.getBlock().getRelative(BlockFace.UP).isLiquid() || event.getBlock().getRelative(BlockFace.UP).getRelative(BlockFace.UP).isLiquid()) - // { - // UtilPlayer.message(event.getPlayer(), F.main("Game", - // "Cannot tunnel under liquids.")); - // - // event.setCancelled(true); - // } - // } + @EventHandler(priority=EventPriority.LOWEST) + public void revivePlayer(CustomDamageEvent event) + { + if (!IsLive() || _bridgesDown || !(event.GetDamageeEntity() instanceof Player)) + { + return; + } + + Player player = event.GetDamageePlayer(); + + if (player.getHealth() - event.GetDamage() > 0) + { + return; + } + + if (!_usedLife.contains(player.getName())) + { + _usedLife.add(player.getName()); + + UtilPlayer.message(player, F.main("Game", "You used your " + F.elem(C.cAqua + "Early Game Revive") + ".")); + + GetTeam(player).SpawnTeleport(player); + player.setHealth(20); + event.SetCancelled("Early Game Revive"); + } + } @EventHandler public void vehicleDeny(PlayerInteractEvent event) @@ -1915,16 +1704,6 @@ public class Bridge extends TeamGame implements OreObsfucation else return 12; } - - @EventHandler - public void debug(PlayerCommandPreprocessEvent event) - { - if (Manager.GetClients().hasRank(event.getPlayer(), Rank.ADMIN) && event.getMessage().contains("/oretoggle")) - _ore.ToggleVisibility(); - - if (Manager.GetClients().hasRank(event.getPlayer(), Rank.ADMIN) && event.getMessage().contains("/bridge")) - _bridgeTime = 30000; - } @EventHandler public void disableIceForm(BlockFormEvent event) @@ -1940,6 +1719,40 @@ public class Bridge extends TeamGame implements OreObsfucation UtilPlayer.message(event.getPlayer(), F.main("Game", "You cannot pickup liquids before the bridges have fallen.")); event.setCancelled(true); } + + @EventHandler + public void disableDoors(CraftItemEvent event) + { + if (_bridgesDown) + { + return; + } + + Material type = event.getRecipe().getResult().getType(); + + if (type == Material.WOOD_DOOR || type == Material.IRON_DOOR) + { + event.setResult(null); + event.setCancelled(true); + } + } + + @EventHandler + public void disableDoors(PlayerPickupItemEvent event) + { + if (_bridgesDown) + { + return; + } + + Material type = event.getItem().getItemStack().getType(); + + if (type == Material.WOOD_DOOR || type == Material.IRON_DOOR) + { + event.getItem().remove(); + event.setCancelled(true); + } + } public void setBridgeTime(int time) { @@ -1961,6 +1774,11 @@ public class Bridge extends TeamGame implements OreObsfucation return _chestLoot; } + public HashSet getBridgeParts() + { + return _bridgeParts; + } + public boolean bridgesDown() { return _bridgesDown; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimation.java new file mode 100644 index 000000000..8c3496f10 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimation.java @@ -0,0 +1,45 @@ +package nautilus.game.arcade.game.games.bridge.animation; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; + +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; +import nautilus.game.arcade.game.games.bridge.BridgePart; +import nautilus.game.arcade.world.WorldData; + +public abstract class BridgeAnimation +{ + + public static final int AVERAGE_BRIDGE_BLOCKS = 3000; + + protected final Bridge _bridge; + protected final WorldData _worldData; + + public BridgeAnimation(Bridge bridge) + { + _bridge = bridge; + _worldData = bridge.WorldData; + } + + public abstract void onParse(); + + public abstract void onUpdate(UpdateType type); + + public void registerBridgePart(BridgePart part) + { + _bridge.getBridgeParts().add(part); + } + + public boolean isAir(Location location) + { + return isAir(location.getBlock()); + } + + public boolean isAir(Block block) + { + return block.getType() == Material.AIR; + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimationType.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimationType.java new file mode 100644 index 000000000..a7a8aa739 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/BridgeAnimationType.java @@ -0,0 +1,44 @@ +package nautilus.game.arcade.game.games.bridge.animation; + +import nautilus.game.arcade.game.games.bridge.Bridge; + +public enum BridgeAnimationType +{ + + WOOD(WoodBridgeAnimation.class, "BROWN", "GRAY"), + ICE(IceBridgeAnimation.class, "LIGHT_BLUE"), + LAVA(LavaBridgeAnimation.class, "BLACK", "RED", "ORANGE"), + LILLY(LillyPadBridgeAnimation.class, "LIME"), + MUSHROOM(MushroomBridgeAnimation.class, "PURPLE") + + ; + + private final Class _clazz; + private final String[] _coloursUsed; + + private BridgeAnimationType(Class clazz, String... coloursUsed) + { + _clazz = clazz; + _coloursUsed = coloursUsed; + } + + public BridgeAnimation createInstance(Bridge bridge) + { + try + { + return _clazz.cast(_clazz.getConstructor(Bridge.class).newInstance(bridge)); + } + catch (Exception e) + { + e.printStackTrace(); + } + + return null; + } + + public String[] getColoursUsed() + { + return _coloursUsed; + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/IceBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/IceBridgeAnimation.java new file mode 100644 index 000000000..6b555e861 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/IceBridgeAnimation.java @@ -0,0 +1,79 @@ +package nautilus.game.arcade.game.games.bridge.animation; + +import java.util.ArrayList; +import java.util.List; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; + +import mineplex.core.common.util.MapUtil; +import mineplex.core.common.util.UtilAlg; +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; + +public class IceBridgeAnimation extends BridgeAnimation +{ + + private List _iceBridge; + + public IceBridgeAnimation(Bridge bridge) + { + super(bridge); + + _iceBridge = new ArrayList<>(AVERAGE_BRIDGE_BLOCKS); + } + + @Override + public void onParse() + { + _iceBridge = _worldData.GetDataLocs("LIGHT_BLUE"); + } + + @Override + public void onUpdate(UpdateType type) + { + if (type != UpdateType.FASTEST || _iceBridge.isEmpty()) + { + return; + } + + int attempts = 0; + int done = 0; + + while (done < 5 && attempts < 400) + { + attempts++; + + // Random Block + Location loc = UtilAlg.Random(_iceBridge); + + Block block = loc.getBlock().getRelative(BlockFace.DOWN); + + if (!block.isLiquid()) + { + continue; + } + + if (block.getRelative(BlockFace.NORTH).isLiquid() && block.getRelative(BlockFace.EAST).isLiquid() && block.getRelative(BlockFace.SOUTH).isLiquid() && block.getRelative(BlockFace.WEST).isLiquid()) + { + continue; + } + + _iceBridge.remove(loc); + + if (Math.random() > 0.25) + { + MapUtil.QuickChangeBlockAt(block.getLocation(), Material.PACKED_ICE); + } + else + { + MapUtil.QuickChangeBlockAt(block.getLocation(), Material.ICE); + } + + done++; + } + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LavaBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LavaBridgeAnimation.java new file mode 100644 index 000000000..2cf015470 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LavaBridgeAnimation.java @@ -0,0 +1,84 @@ +package nautilus.game.arcade.game.games.bridge.animation; + +import java.util.ArrayList; +import java.util.List; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.block.BlockFace; +import org.bukkit.entity.FallingBlock; + +import mineplex.core.common.util.UtilMath; +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; +import nautilus.game.arcade.game.games.bridge.BridgePart; + +public class LavaBridgeAnimation extends BridgeAnimation +{ + + private List _lavaSource; + private List _lavaBridge; + + public LavaBridgeAnimation(Bridge bridge) + { + super(bridge); + + _lavaSource = new ArrayList<>(); + _lavaBridge = new ArrayList<>(AVERAGE_BRIDGE_BLOCKS); + } + + @Override + public void onParse() + { + for (Location loc : _worldData.GetDataLocs("RED")) + { + _lavaBridge.add(loc.getBlock().getLocation()); + } + + for (Location loc : _worldData.GetDataLocs("ORANGE")) + { + _lavaBridge.add(loc.getBlock().getLocation()); + _lavaBridge.add(loc.getBlock().getRelative(BlockFace.UP).getLocation()); + } + + _lavaSource = _worldData.GetDataLocs("BLACK"); + } + + @Override + public void onUpdate(UpdateType type) + { + if (type != UpdateType.FASTEST) + { + return; + } + + for (int i = 0; i < 3; i++) + { + if (!_lavaBridge.isEmpty() && !_lavaSource.isEmpty()) + { + // Random Block + Location bestLoc = _lavaBridge.get(UtilMath.r(_lavaBridge.size())); + + if (bestLoc.getBlock().getRelative(BlockFace.DOWN).isLiquid()) + { + continue; + } + + _lavaBridge.remove(bestLoc); + + Location source = _lavaSource.get(UtilMath.r(_lavaSource.size())); + + // Create Part + FallingBlock block = bestLoc.getWorld().spawnFallingBlock(source, Material.NETHERRACK, (byte) 0); + BridgePart part = new BridgePart(block, bestLoc, true); + + registerBridgePart(part); + + // Sound + source.getWorld().playSound(source, Sound.EXPLODE, 5f * (float) Math.random(), 0.5f + (float) Math.random()); + } + } + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LillyPadBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LillyPadBridgeAnimation.java new file mode 100644 index 000000000..839a9536e --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/LillyPadBridgeAnimation.java @@ -0,0 +1,65 @@ +package nautilus.game.arcade.game.games.bridge.animation; + +import java.util.HashMap; +import java.util.Map; + +import org.bukkit.Effect; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.BlockFace; + +import mineplex.core.common.util.MapUtil; +import mineplex.core.common.util.UtilAlg; +import mineplex.core.common.util.UtilTime; +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; + +public class LillyPadBridgeAnimation extends BridgeAnimation +{ + + private Map _lillyPads = new HashMap<>(); + + public LillyPadBridgeAnimation(Bridge bridge) + { + super(bridge); + } + + @Override + public void onParse() + { + for (Location loc : _worldData.GetDataLocs("LIME")) + { + _lillyPads.put(loc, 0L); + } + } + + @Override + public void onUpdate(UpdateType type) + { + if (type != UpdateType.FASTEST) + return; + + for (int i = 0; i < 3; i++) + { + if (_lillyPads != null && !_lillyPads.isEmpty()) + { + // Random Block + Location loc = UtilAlg.Random(_lillyPads.keySet()); + + if (!UtilTime.elapsed(_lillyPads.get(loc), 8000)) + continue; + + if (!loc.getBlock().getRelative(BlockFace.DOWN).isLiquid()) + continue; + + _lillyPads.remove(loc); + + MapUtil.QuickChangeBlockAt(loc, Material.WATER_LILY); + + // Sound + loc.getWorld().playEffect(loc, Effect.STEP_SOUND, 111); + } + } + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/MushroomBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/MushroomBridgeAnimation.java new file mode 100644 index 000000000..dad3ecdb7 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/MushroomBridgeAnimation.java @@ -0,0 +1,107 @@ +package nautilus.game.arcade.game.games.bridge.animation; + +import java.util.HashMap; +import java.util.Map; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; + +import mineplex.core.common.util.MapUtil; +import mineplex.core.common.util.UtilAlg; +import mineplex.core.common.util.UtilTime; +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; + +public class MushroomBridgeAnimation extends BridgeAnimation +{ + + private Map _mushroomStem = new HashMap<>(); + private Map _mushroomTop = new HashMap<>(); + private boolean _stemsGrown = false; + + public MushroomBridgeAnimation(Bridge bridge) + { + super(bridge); + } + + @Override + public void onParse() + { + for (Location loc : _worldData.GetCustomLocs("21")) + { + _mushroomStem.put(loc, 0L); + loc.getBlock().setType(Material.AIR); + } + + for (Location loc : _worldData.GetDataLocs("PURPLE")) + { + _mushroomTop.put(loc, 0L); + } + } + + @Override + public void onUpdate(UpdateType type) + { + if (_mushroomStem != null && !_mushroomStem.isEmpty()) + { + for (int i = 0; i < 4 && !_mushroomStem.isEmpty(); i++) + { + double lowestY = 0; + Location lowestLoc = null; + + for (Location loc : _mushroomStem.keySet()) + { + if (!UtilTime.elapsed(_mushroomStem.get(loc), 6000)) + continue; + + if (lowestLoc == null || loc.getY() < lowestY) + { + lowestY = loc.getY(); + lowestLoc = loc; + } + } + + if (lowestLoc == null) + continue; + + _mushroomStem.remove(lowestLoc); + + MapUtil.QuickChangeBlockAt(lowestLoc, 100, (byte) 15); + } + } + else + { + _stemsGrown = true; + } + + if (_stemsGrown && _mushroomTop != null && !_mushroomTop.isEmpty()) + { + int attempts = 0; + int done = 0; + while (done < 6 && attempts < 400) + { + attempts++; + + // Random Block + Location loc = UtilAlg.Random(_mushroomTop.keySet()); + + if (!UtilTime.elapsed(_mushroomTop.get(loc), 6000)) + continue; + + Block block = loc.getBlock(); + + if (block.getRelative(BlockFace.DOWN).getType() == Material.AIR && block.getRelative(BlockFace.NORTH).getType() == Material.AIR && block.getRelative(BlockFace.EAST).getType() == Material.AIR && block.getRelative(BlockFace.SOUTH).getType() == Material.AIR && block.getRelative(BlockFace.WEST).getType() == Material.AIR) + continue; + + _mushroomTop.remove(loc); + + MapUtil.QuickChangeBlockAt(block.getLocation(), 99, (byte) 14); + + done++; + } + } + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/WoodBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/WoodBridgeAnimation.java new file mode 100644 index 000000000..e149f2bc3 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/WoodBridgeAnimation.java @@ -0,0 +1,129 @@ +package nautilus.game.arcade.game.games.bridge.animation; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.BlockFace; +import org.bukkit.entity.FallingBlock; +import org.bukkit.util.Vector; + +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; +import nautilus.game.arcade.game.games.bridge.BridgePart; + +public class WoodBridgeAnimation extends BridgeAnimation +{ + + private static final BlockFace[] FACES = new BlockFace[] { BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST }; + private static final int Y_MOD = 30; + + private final Map _woodBridge; + + public WoodBridgeAnimation(Bridge bridge) + { + super(bridge); + + _woodBridge = new HashMap<>(AVERAGE_BRIDGE_BLOCKS); + } + + @Override + public void onParse() + { + onParse(_worldData.GetDataLocs("BROWN"), false); + onParse(_worldData.GetDataLocs("GRAY"), true); + } + + public void onParse(List locations, boolean aboveBelow) + { + for (Location location : locations) + { + if (aboveBelow) + { + _woodBridge.put(location.getBlock().getRelative(BlockFace.UP).getLocation(), Material.FENCE); + _woodBridge.put(location, Material.LOG); + } + else + { + _woodBridge.put(location, Material.WOOD_STEP); + } + } + } + + @Override + public void onUpdate(UpdateType type) + { + if (type != UpdateType.FASTEST) + { + return; + } + + List toDo = new ArrayList<>(); + + for (Location location : _woodBridge.keySet()) + { + Material material = _woodBridge.get(location); + + if (material == Material.LOG) + { + int adjacent = 0; + + for (BlockFace face : FACES) + { + if (!isAir(location.getBlock().getRelative(face))) + { + adjacent++; + } + } + if (adjacent > 0) + { + toDo.add(location); + } + } + else if (material == Material.FENCE) + { + if (!isAir(location.getBlock().getRelative(BlockFace.DOWN))) + { + toDo.add(location); + } + } + else if (material == Material.WOOD_STEP) + { + int adjacent = 0; + + for (BlockFace face : FACES) + { + if (!isAir(location.getBlock().getRelative(face))) + { + adjacent++; + } + } + if (adjacent > 0) + { + toDo.add(location); + } + } + } + + if (toDo.isEmpty()) + { + return; + } + + for (Location location : toDo) + { + Material material = _woodBridge.remove(location); + Location source = location.clone().add(0, Y_MOD, 0); + + // Create Part + FallingBlock block = location.getWorld().spawnFallingBlock(source, material, (byte) 0); + block.setVelocity(new Vector(0, -1, 0)); + BridgePart part = new BridgePart(block, location, false); + + registerBridgePart(part); + } + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java new file mode 100644 index 000000000..fe5e6ed04 --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/CustomBridgeAnimation.java @@ -0,0 +1,246 @@ +package nautilus.game.arcade.game.games.bridge.animation.custom; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.bukkit.Effect; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.Sound; +import org.bukkit.World; +import org.bukkit.block.Block; + +import mineplex.core.blockrestore.BlockRestore; +import mineplex.core.common.util.UtilBlock; +import mineplex.core.common.util.UtilMath; +import mineplex.core.common.util.UtilParticle; +import mineplex.core.common.util.UtilParticle.ParticleType; +import mineplex.core.common.util.UtilParticle.ViewDist; +import nautilus.game.arcade.game.games.bridge.Bridge; +import nautilus.game.arcade.game.games.bridge.animation.BridgeAnimation; + +public abstract class CustomBridgeAnimation extends BridgeAnimation +{ + + private static final String BLOCK_IDS_KEY = "BLOCK_IDS"; + private static final String RATE_KEY = "RATE"; + private static final String PARTICLE_KEY = "PARTICLE"; + private static final String SOUND_KEY = "SOUND"; + private static final String REGION_KEY = "BRIDGE"; + + protected final BlockRestore _restore; + + private final String _typeKey; + protected final Map _bridgeBlocks; + + // Configuration + protected List _blockIds; + protected int _rate; + protected ParticleType _particle; + + // Sound + protected Sound _sound; + protected float _pitch; + + protected double _maxDistance; + + public CustomBridgeAnimation(Bridge bridge, String typeKey) + { + super(bridge); + + _restore = bridge.getArcadeManager().GetBlockRestore(); + + _typeKey = typeKey; + _bridgeBlocks = new HashMap<>(AVERAGE_BRIDGE_BLOCKS); + + // Defaults + // Wood, Logs, Fences + _blockIds = Arrays.asList(5, 17, 85); + _rate = 1; + _particle = ParticleType.BLOCK_DUST; + } + + @Override + public void onParse() + { + List blockIds = new ArrayList<>(); + + for (String key : _worldData.GetAllCustomLocs().keySet()) + { + String[] split = key.split(" "); + String subKey = split[0]; + + if (split.length < 2) + { + continue; + } + + switch (subKey) + { + + case BLOCK_IDS_KEY: + // Set the block ids that the animation will use + + for (int i = 1; i < split.length; i++) + { + try + { + blockIds.add(Integer.parseInt(split[i])); + } + catch (NumberFormatException e) + { + continue; + } + } + + break; + + case RATE_KEY: + // Set the rate at which the animation will run at + + try + { + _rate = Integer.parseInt(split[1]); + } + catch (NumberFormatException e) + { + continue; + } + + break; + + case PARTICLE_KEY: + // Set which type of particle will be displayed when a block + // spawns + + try + { + _particle = ParticleType.valueOf(split[1]); + } + catch (IllegalArgumentException e) + { + continue; + } + + break; + + case SOUND_KEY: + // Set the sound and pitch that will be played when a block + // spawns + + if (split.length < 3) + { + continue; + } + + try + { + _sound = Sound.valueOf(split[1]); + } + catch (IllegalArgumentException e) + { + continue; + } + + try + { + _pitch = Float.parseFloat(split[2]); + } + catch (NumberFormatException e) + { + continue; + } + + break; + + default: + break; + } + } + + // Set configuration values + _blockIds = blockIds; + + // Save all blocks in a big map. + for (String key : _worldData.GetAllCustomLocs().keySet()) + { + if (!key.startsWith(REGION_KEY)) + { + continue; + } + + List locations = _worldData.GetCustomLocs(key); + + if (locations.size() < 2) + { + continue; + } + + for (Block block : UtilBlock.getInBoundingBox(locations.get(0), locations.get(1))) + { + if (!_blockIds.contains(block.getTypeId()) || _bridgeBlocks.containsKey(block)) + { + continue; + } + + double dist = UtilMath.offset2d(block.getLocation(), _bridge.GetSpectatorLocation()); + + if (dist > _maxDistance) + { + _maxDistance = dist; + } + + _restore.add(block, Material.AIR.getId(), (byte) 0, Integer.MAX_VALUE); + _bridgeBlocks.put(block.getLocation(), dist); + } + } + } + + public void onBlockSet(Block block) + { + World world = _worldData.World; + Location location = block.getLocation().add(0.5, 0.5, 0.5); + + if (_particle != null) + { + if (_particle == ParticleType.BLOCK_DUST) + { + world.playEffect(location, Effect.STEP_SOUND, block.getType(), block.getData()); + } + else + { + UtilParticle.PlayParticleToAll(_particle, block.getLocation(), 0.5F, 0.5F, 0.5F, 0.5F, 5, ViewDist.NORMAL); + } + } + + if (_sound != null) + { + world.playSound(location, _sound, 1, _pitch); + } + } + + public final String getTypeKey() + { + return _typeKey; + } + + @Override + public String toString() + { + StringBuilder builder = new StringBuilder(); + + builder.append("Type: " + _typeKey).append("\n"); + builder.append("Bridge Blocks: " + _bridgeBlocks.size()).append("\n"); + builder.append("Block Ids: " + _blockIds).append("\n"); + builder.append("Rate: " + _rate).append("\n"); + builder.append("Particle: " + (_particle == null ? "Null" : _particle.getFriendlyName())).append("\n"); + builder.append("Sound: " + (_sound == null ? "Null" : _sound.toString() + " Pitch: " + _pitch)).append("\n"); + builder.append("Max Distance: " + _maxDistance).append("\n"); + + return builder.toString(); + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java new file mode 100644 index 000000000..fe0779c7c --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RadiusCustomBridgeAnimation.java @@ -0,0 +1,58 @@ +package nautilus.game.arcade.game.games.bridge.animation.custom; + +import java.util.Iterator; + +import org.bukkit.Location; +import org.bukkit.block.Block; + +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; + +public class RadiusCustomBridgeAnimation extends CustomBridgeAnimation +{ + + private double _minDistance; + + public RadiusCustomBridgeAnimation(Bridge bridge) + { + super(bridge, "RADIUS"); + } + + @Override + public void onParse() + { + super.onParse(); + + _minDistance = _maxDistance; + } + + @Override + public void onUpdate(UpdateType type) + { + if (type != UpdateType.FAST) + { + return; + } + + _minDistance -= _rate; + + Iterator iterator = _bridgeBlocks.keySet().iterator(); + + while (iterator.hasNext()) + { + Location location = iterator.next(); + double dist = _bridgeBlocks.get(location); + + if (dist > _minDistance) + { + Block block = location.getBlock(); + + _restore.restore(block); + onBlockSet(block); + + iterator.remove(); + } + } + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RandomCustomBridgeAnimation.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RandomCustomBridgeAnimation.java new file mode 100644 index 000000000..badf135bb --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/animation/custom/RandomCustomBridgeAnimation.java @@ -0,0 +1,44 @@ +package nautilus.game.arcade.game.games.bridge.animation.custom; + +import java.util.Iterator; + +import org.bukkit.Location; +import org.bukkit.block.Block; + +import mineplex.core.updater.UpdateType; +import nautilus.game.arcade.game.games.bridge.Bridge; + +public class RandomCustomBridgeAnimation extends CustomBridgeAnimation +{ + + public RandomCustomBridgeAnimation(Bridge bridge) + { + super(bridge, "RANDOM"); + } + + @Override + public void onUpdate(UpdateType type) + { + if (type != UpdateType.TICK) + { + return; + } + + Iterator iterator = _bridgeBlocks.keySet().iterator(); + int i = 0; + + while (iterator.hasNext() && i < _rate) + { + i++; + Location location = iterator.next(); + + Block block = location.getBlock(); + + _restore.restore(block); + onBlockSet(block); + + iterator.remove(); + } + } + +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java index 78fc4acae..021c06e83 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitApple.java @@ -36,4 +36,4 @@ public class KitApple extends ProgressingKit { } -} +} \ No newline at end of file diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java index a02a04427..87ee2d8dd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitArcher.java @@ -53,6 +53,6 @@ public class KitArcher extends ProgressingKit Bridge bridge = (Bridge) Manager.GetGame(); if(!bridge.hasUsedRevive(player)) - player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW)); + player.getInventory().addItem(PLAYER_ITEMS); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java index 497017ee6..9204c8d7a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBerserker.java @@ -46,4 +46,4 @@ public class KitBerserker extends ProgressingKit { player.getInventory().addItem(PLAYER_ITEMS); } -} +} \ No newline at end of file diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java index b5710854f..178ae8ef1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitDestructor.java @@ -44,7 +44,7 @@ public class KitDestructor extends ProgressingKit { super(manager, "Destructor", "bridgedesctructor", KitAvailability.Achievement, 99999, DESCRIPTION, PERKS, EntityType.ZOMBIE, IN_HAND); - this.setAchievementRequirements(ACHIEVEMENTS); + setAchievementRequirements(ACHIEVEMENTS); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/OverpoweredBridge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/OverpoweredBridge.java index 17b6b5ce5..5935aaee0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/OverpoweredBridge.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/modes/OverpoweredBridge.java @@ -14,7 +14,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; @@ -29,7 +28,6 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.PlayerPrepareTeleportEvent; -import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.games.AbsorptionFix; import nautilus.game.arcade.game.games.bridge.Bridge; import net.md_5.bungee.api.ChatColor; @@ -72,38 +70,8 @@ public class OverpoweredBridge extends Bridge public void ParseData() { _starterChests = new HashMap<>(); - - ParseLavaBridge(); - ParseWoodBridge(); - ParseIceBridge(); - ParseLillyPad(); - ParseMushrooms(); - - ParseChests(); - - ParseOre(WorldData.GetCustomLocs("73")); // Red - ParseOre(WorldData.GetCustomLocs("14")); // Yellow - ParseOre(WorldData.GetCustomLocs("129")); // Green - ParseOre(WorldData.GetCustomLocs("56")); // Blue - - //Mass Teams - if (!WorldData.GetCustomLocs("152").isEmpty()) - ParseOre(WorldData.GetCustomLocs("152")); - if (!WorldData.GetCustomLocs("41").isEmpty()) - ParseOre(WorldData.GetCustomLocs("41")); - if (!WorldData.GetCustomLocs("133").isEmpty()) - ParseOre(WorldData.GetCustomLocs("133")); - if (!WorldData.GetCustomLocs("57").isEmpty()) - ParseOre(WorldData.GetCustomLocs("57")); - - if (!WorldData.GetCustomLocs("100").isEmpty()) - ParseOre(WorldData.GetCustomLocs("100")); - if (!WorldData.GetCustomLocs("86").isEmpty()) - ParseOre(WorldData.GetCustomLocs("86")); - if (!WorldData.GetCustomLocs("103").isEmpty()) - ParseOre(WorldData.GetCustomLocs("103")); - if (!WorldData.GetCustomLocs("22").isEmpty()) - ParseOre(WorldData.GetCustomLocs("22")); + + super.ParseData(); } @EventHandler diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/Module.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/Module.java index 2aed67d39..638d2620b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/Module.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/Module.java @@ -1,10 +1,7 @@ package nautilus.game.arcade.game.modules; import com.google.gson.JsonElement; -import mineplex.core.Managers; -import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.game.Game; -import nautilus.game.arcade.game.TeamGame; import org.bukkit.event.Listener; /** diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/WorldBorderModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/WorldBorderModule.java new file mode 100644 index 000000000..6a1f13bae --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/WorldBorderModule.java @@ -0,0 +1,116 @@ +package nautilus.game.arcade.game.modules; + +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import mineplex.core.common.Pair; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.packethandler.IPacketHandler; +import mineplex.core.packethandler.PacketHandler; +import mineplex.core.packethandler.PacketInfo; +import nautilus.game.arcade.events.GameStateChangeEvent; +import nautilus.game.arcade.game.Game.GameState; +import net.minecraft.server.v1_8_R3.PacketPlayOutWorldBorder; +import net.minecraft.server.v1_8_R3.PacketPlayOutWorldBorder.EnumWorldBorderAction; +import net.minecraft.server.v1_8_R3.WorldBorder; + +public class WorldBorderModule extends Module implements IPacketHandler +{ + + private PacketHandler _packetHandler; + private Map _sizeToSet; + private Map> _centerToSet; + + @Override + protected void setup() + { + _packetHandler = getGame().getArcadeManager().getPacketHandler(); + _sizeToSet = new HashMap<>(); + _centerToSet = new HashMap<>(); + } + + @EventHandler(priority = EventPriority.LOWEST) + public void live(GameStateChangeEvent event) + { + if (event.GetState() != GameState.Prepare) + { + return; + } + + _packetHandler.addPacketHandler(this, PacketPlayOutWorldBorder.class); + } + + @Override + public void handle(PacketInfo packetInfo) + { + UUID player = packetInfo.getPlayer().getUniqueId(); + PacketPlayOutWorldBorder packet = (PacketPlayOutWorldBorder) packetInfo.getPacket(); + + try + { + Field actionField = packet.getClass().getDeclaredField("a"); + actionField.setAccessible(true); + EnumWorldBorderAction action = (EnumWorldBorderAction) actionField.get(packet); + + if (action == EnumWorldBorderAction.SET_SIZE) + { + Field sizeField = packet.getClass().getDeclaredField("e"); + sizeField.setAccessible(true); + double newSize = _sizeToSet.get(player); + + sizeField.set(packet, newSize); + } + else if (action == EnumWorldBorderAction.SET_CENTER) + { + Field xField = packet.getClass().getDeclaredField("c"); + Field zField = packet.getClass().getDeclaredField("d"); + + xField.setAccessible(true); + zField.setAccessible(true); + + Pair pair = _centerToSet.get(player); + + xField.set(packet, pair.getLeft()); + zField.set(packet, pair.getRight()); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + @Override + public void cleanup() + { + _packetHandler.removePacketHandler(this); + } + + public void setSize(Player player, double size) + { + _sizeToSet.put(player.getUniqueId(), size); + + sendPacket(player, EnumWorldBorderAction.SET_SIZE); + } + + public void setCenter(Player player, Location location) + { + _centerToSet.put(player.getUniqueId(), Pair.create(location.getX(), location.getZ())); + + sendPacket(player, EnumWorldBorderAction.SET_CENTER); + } + + private void sendPacket(Player player, EnumWorldBorderAction action) + { + WorldBorder border = ((CraftWorld) player.getWorld()).getHandle().getWorldBorder(); + UtilPlayer.sendPacket(player, new PacketPlayOutWorldBorder(border, action)); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java index a93f7415e..eabe114f5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java @@ -30,6 +30,7 @@ import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; +import mineplex.core.common.util.UtilText; import mineplex.core.donation.Donor; import mineplex.core.menu.Menu; import mineplex.core.progression.ProgressiveKit; @@ -53,6 +54,8 @@ import net.minecraft.server.v1_8_R3.World; public abstract class ProgressingKit extends Kit implements ProgressiveKit { + public static final String COOLDOWN = "Cooldown"; + private static final FireworkEffect EFFECT = FireworkEffect.builder() .withColor(Color.AQUA) .with(Type.BALL) @@ -420,6 +423,11 @@ public abstract class ProgressingKit extends Kit implements ProgressiveKit return "Receive " + C.cGreen + amount + C.cWhite + " " + item + " every " + C.cGreen + time + C.cWhite + " second" + (time == 1 ? "" : "s") + (max > 0 ? ". Max " + C.cGreen + max : ""); } + + public static String receiveItem(String item, int amount) + { + return "Receive " + (amount == 1 ? (UtilText.startsWithVowel(item) ? "an" :" a") : C.cGreen + amount) + " " + item; + } public static String click(boolean left, String comp) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java index 5d63023a5..8c575627c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java @@ -294,7 +294,9 @@ public class PerkDestructor extends Perk if (lowest != null) { - if (lowest.getType() != Material.AIR && UtilBlock.airFoliage(lowest.getRelative(BlockFace.DOWN))) + Block down = lowest.getRelative(BlockFace.DOWN); + + if (lowest.getType() != Material.AIR && (UtilBlock.airFoliage(down) || down.isLiquid())) { lowest.getWorld().playEffect(lowest.getLocation(), Effect.STEP_SOUND, lowest.getType()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java index 90316be6e..61d4b8923 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/DeathBomberStatTracker.java @@ -1,17 +1,16 @@ package nautilus.game.arcade.stats; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityDamageEvent; - import mineplex.core.common.util.UtilPlayer; import mineplex.minecraft.game.core.combat.event.CombatDeathEvent; import nautilus.game.arcade.game.Game; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; public class DeathBomberStatTracker extends StatTracker { @@ -52,6 +51,11 @@ public class DeathBomberStatTracker extends StatTracker if(killer.equals(killed)) return; + if (killer.getItemInHand().getType() != Material.TNT) + { + return; + } + if (event.GetLog().GetKiller() != null && event.GetLog().GetKiller().GetReason().contains("Throwing TNT")) { Integer count = _killCount.get(killer.getUniqueId()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java index 5495e89a2..de127e6b2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/stats/FoodForTheMassesStatTracker.java @@ -1,5 +1,6 @@ package nautilus.game.arcade.stats; +import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -40,6 +41,11 @@ public class FoodForTheMassesStatTracker extends StatTracker Player player = UtilPlayer.searchExact(event.GetLog().GetPlayer().GetName()); if (player == null) return; + + if (killer.getItemInHand().getType() != Material.APPLE) + { + return; + } if (event.GetLog().GetKiller().GetReason() != null && event.GetLog().GetKiller().GetReason().contains("Apple Thrower")) { From 4f774135233bce93af0dfbbc8c079d382eca5fd5 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:17:47 -0500 Subject: [PATCH 74/91] PC-265 --- .../mineplex/core/gadget/gadgets/morph/MorphVillager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java index 729c115b0..f4cf0f975 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphVillager.java @@ -147,12 +147,12 @@ public class MorphVillager extends MorphGadget implements IThrown { if (_gems.contains(event.getItem())) { - event.setCancelled(true); - event.getItem().remove(); - - Manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, event.getPlayer(), getName() + " Pickup", 16); + Manager.getDonationManager().rewardCurrency(GlobalCurrency.GEM, event.getPlayer(), getName() + " Pickup", 16 * event.getItem().getItemStack().getAmount()); event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.ORB_PICKUP, 1f, 2f); + + event.setCancelled(true); + event.getItem().remove(); } } From 873cd9c2a588f300977956c0f6709b96b98a6447 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 20:01:01 -0500 Subject: [PATCH 75/91] PC-802 --- .../src/nautilus/game/arcade/game/Game.java | 3 +++ .../src/nautilus/game/arcade/game/games/uhc/UHC.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) 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 c9f13d3ef..145dec937 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 @@ -88,6 +88,7 @@ import nautilus.game.arcade.game.GameTeam.PlayerState; import nautilus.game.arcade.game.games.build.Build; import nautilus.game.arcade.game.games.draw.Draw; import nautilus.game.arcade.game.games.speedbuilders.SpeedBuilders; +import nautilus.game.arcade.game.modules.AntiExpOrbModule; import nautilus.game.arcade.game.modules.Module; import nautilus.game.arcade.game.modules.compass.CompassModule; import nautilus.game.arcade.kit.ChampionsKit; @@ -470,6 +471,8 @@ public abstract class Game extends ListenerComponent implements Lifetimed }; System.out.println("Loading " + GetName() + "..."); + + new AntiExpOrbModule().register(this); } // You should never use this so please don't. Use Module.register instead diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java index 3e5b66bc6..ce027ddac 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java @@ -289,7 +289,6 @@ public abstract class UHC extends Game .setGiveCompass(false) .register(this); new OreVeinEditorModule().removeNonAirVeins().register(this); - new AntiExpOrbModule().register(this); new RejoinModule().register(this); new AbsorptionFix(this); From f03df672199e62b6b032b2287ff98618f2fafa2c Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 22:00:02 -0500 Subject: [PATCH 76/91] PC-830 --- .../src/mineplex/core/common/util/UtilColor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java index 73e1faf44..9ee61c186 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilColor.java @@ -56,6 +56,8 @@ public class UtilColor return 13; case DARK_AQUA: return 9; + case DARK_RED: + return 12; case DARK_PURPLE: return 10; case GOLD: From a97ba5d1fd06c9df26a4266521aa3f076eb4c4b4 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 21:48:40 -0500 Subject: [PATCH 77/91] PC-941 --- .../mineplex/core/message/MessageManager.java | 96 ++++++++++--------- .../core/message/commands/AdminCommand.java | 4 +- .../message/commands/MessageAdminCommand.java | 20 +++- .../core/message/commands/MessageCommand.java | 11 ++- .../message/commands/ResendAdminCommand.java | 15 ++- .../mineplex/core/preferences/Preference.java | 4 +- 6 files changed, 98 insertions(+), 52 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java index eec908cdf..cbb4950e9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java @@ -41,7 +41,9 @@ import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitRunnable; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.UUID; public class MessageManager extends MiniClientPlugin @@ -55,7 +57,7 @@ public class MessageManager extends MiniClientPlugin private PreferencesManager _preferences; private Punish _punish; private Chat _chat; - private ArrayList _randomMessage; + private List _randomMessage; private String _serverName; public MessageManager(JavaPlugin plugin, IncognitoManager incognitoManager, CoreClientManager clientManager, PreferencesManager preferences, @@ -301,44 +303,50 @@ public class MessageManager extends MiniClientPlugin @Override public void enable() { - _randomMessage = new ArrayList(); - _randomMessage.clear(); - _randomMessage.add("Hello, do you have any wild boars for purchase?"); - _randomMessage.add("There's a snake in my boot!"); - _randomMessage.add("Monk, I need a Monk!"); - _randomMessage.add("Hi, I'm from planet minecraft, op me plz dooooood!"); - _randomMessage.add("Somebody's poisoned the waterhole!"); - _randomMessage.add("MORE ORBZ MORE ORBZ MORE ORBZ MORE ORBZ!"); - _randomMessage.add("Chiss is a chiss and chiss chiss."); - _randomMessage.add("*_*"); - _randomMessage.add("#swag"); - _randomMessage.add("Everything went better then I thought."); - _randomMessage.add("HAVE A CHICKEN!"); - _randomMessage.add("follow me, i have xrays"); - _randomMessage.add("I'm making a java"); - _randomMessage.add("Do you talk to strangers? I have candy if it helps."); - _randomMessage.add("Solid 2.9/10"); - _randomMessage.add("close your eyes to sleep"); - _randomMessage.add("I crashed because my internet ran out."); - _randomMessage.add("I saw morgan freeman on a breaking bad ad on a bus."); - _randomMessage.add("Where is the volume control?"); - _randomMessage.add("I saw you playing on youtube with that guy and stuff."); - _randomMessage.add("Your worms must be worse than useless."); - _randomMessage.add("meow"); - _randomMessage.add("7"); - _randomMessage.add("Don't you wish your girlfriend was hot like me?"); - _randomMessage.add("how do you play mindcrafts?"); - _randomMessage.add("7 cats meow meow meow meow meow meow meow"); - _randomMessage.add("For King Jonalon!!!!!"); - _randomMessage.add("Do you like apples?"); - _randomMessage.add("I'm Happy Happy Happy."); - _randomMessage.add("kthxbye"); - _randomMessage.add("i like pie."); - _randomMessage.add("Do you play Clash of Clans?"); - _randomMessage.add("Mmm...Steak!"); - _randomMessage.add("Poop! Poop everywhere!"); - _randomMessage.add("I'm so forgetful. Like I was going to say somethin...wait what were we talking about?"); - _randomMessage.add("Mmm...Steak!"); + _randomMessage = Arrays.asList( + "The FitnessGram™ Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues", + "do you feel it now mr krabs?!", + "hisssssssss", + "what's a leader?", + "what guardians?", + "rawr!", + "where were you when the emus won the great emu war?", + "Hello, do you have any wild boars for purchase?", + "There's a snake in my boot!", + "Monk, I need a Monk!", + "Hi, I'm from planet minecraft, op me plz dooooood!", + "Somebody's poisoned the waterhole!", + "MORE ORBZ MORE ORBZ MORE ORBZ MORE ORBZ!", + "Chiss is a chiss and chiss chiss.", + "*_*", + "#swag", + "Everything went better then I thought.", + "HAVE A CHICKEN!", + "follow me, i have xrays", + "I'm making a java", + "Solid 2.9/10", + "close your eyes to sleep", + "I crashed because my internet ran out.", + "I saw morgan freeman on a breaking bad ad on a bus.", + "Where is the volume control?", + "I saw you playing on youtube with that guy and stuff.", + "Your worms must be worse than useless.", + "meow", + "7", + "Don't you wish your girlfriend was hot like me?", + "how do you play mindcrafts?", + "7 cats meow meow meow meow meow meow meow", + "For King Jonalon!!!!!", + "Do you like apples?", + "I'm Happy Happy Happy.", + "kthxbye", + "i like pie.", + "Do you play Clash of Clans?", + "Mmm...Steak!", + "Poop! Poop everywhere!", + "I'm so forgetful. Like I was going to say somethin...wait what were we talking about?", + "Mmm...Steak!" + ); } public CoreClientManager GetClientManager() @@ -354,11 +362,6 @@ public class MessageManager extends MiniClientPlugin return _randomMessage.get(UtilMath.r(_randomMessage.size())); } - public ArrayList GetRandomMessages() - { - return _randomMessage; - } - public void Help(Player caller) { Help(caller, null); @@ -641,4 +644,9 @@ public class MessageManager extends MiniClientPlugin { return _incognitoManager; } + + public PreferencesManager getPreferences() + { + return this._preferences; + } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java index 24cd9db26..8630d80ad 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/AdminCommand.java @@ -22,8 +22,8 @@ public class AdminCommand extends CommandBase public void Execute(Player caller, String[] args) { if (args == null || args.length == 0) - { - Plugin.Help(caller); + { + UtilPlayer.message(caller, F.main(Plugin.getName(), "Usage: " + F.elem("/a "))); } else { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java index 3dab673b8..192cf3c0d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageAdminCommand.java @@ -10,6 +10,7 @@ import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.message.MessageManager; +import mineplex.core.preferences.Preference; public class MessageAdminCommand extends CommandBase { @@ -27,7 +28,24 @@ public class MessageAdminCommand extends CommandBase } else { - String message = args.length > 1 ? F.combine(args, 1, null, false) : Plugin.GetRandomMessage(); + // Parse Message + String message; + if (args.length > 1) + { + message = F.combine(args, 1, null, false); + } + else + { + if (Plugin.getPreferences().get(caller).isActive(Preference.RANDOM_MESSAGES)) + { + message = Plugin.GetRandomMessage(); + } + else + { + UtilPlayer.message(caller, F.main(Plugin.getName(), "Cat got your tongue?")); + return; + } + } Plugin.sendMessage(caller, args[0], message, false, true); } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageCommand.java index 03ceaa5fd..0dd7724e7 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/MessageCommand.java @@ -10,6 +10,7 @@ import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.message.MessageManager; +import mineplex.core.preferences.Preference; public class MessageCommand extends CommandBase { @@ -35,7 +36,15 @@ public class MessageCommand extends CommandBase } else { - message = Plugin.GetRandomMessage(); + if (Plugin.getPreferences().get(caller).isActive(Preference.RANDOM_MESSAGES)) + { + message = Plugin.GetRandomMessage(); + } + else + { + UtilPlayer.message(caller, F.main(Plugin.getName(), "Cat got your tongue?")); + return; + } } Plugin.sendMessage(caller, args[0], message, false, false); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java index 3d5b1ce93..492f8d7bb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/message/commands/ResendAdminCommand.java @@ -7,6 +7,7 @@ import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.core.message.MessageManager; +import mineplex.core.preferences.Preference; public class ResendAdminCommand extends CommandBase { @@ -19,8 +20,8 @@ public class ResendAdminCommand extends CommandBase public void Execute(Player caller, String[] args) { if (args == null || args.length == 0) - { - Plugin.Help(caller); + { + UtilPlayer.message(caller, F.help(Plugin.getName(), "/ra [message]", GetRequiredRank())); } else { @@ -41,7 +42,15 @@ public class ResendAdminCommand extends CommandBase } else { - message = Plugin.GetRandomMessage(); + if (Plugin.getPreferences().get(caller).isActive(Preference.RANDOM_MESSAGES)) + { + message = Plugin.GetRandomMessage(); + } + else + { + UtilPlayer.message(caller, F.main(Plugin.getName(), "Cat got your tongue?")); + return; + } } Plugin.sendMessage(caller, lastTo, message, true, true); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java index fbeb15eb2..66c0f116c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java @@ -46,7 +46,9 @@ public enum Preference COMMUNITY_INVITES(true, PreferenceCategory.SOCIAL, Material.BOOK, "Show Community Invites"), - PARTY_DISPLAY_INVENTORY_UI(true, PreferenceCategory.SOCIAL, Material.CHEST, "Display Parties GUI") + PARTY_DISPLAY_INVENTORY_UI(true, PreferenceCategory.SOCIAL, Material.CHEST, "Display Parties GUI"), + + RANDOM_MESSAGES(true, PreferenceCategory.USER, Material.COMMAND, "Send random messages", "Got nothing to say? We got you covered!") ; private static final Map PREFERENCE_MAP = Maps.newHashMap(); From 422bbcce2c5919c66082d6043a876adfae482120 Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 23:17:07 -0500 Subject: [PATCH 78/91] PC-1025 --- .../src/mineplex/core/gadget/types/WinEffectGadget.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java index 06d6d9475..3b16c5c4a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/WinEffectGadget.java @@ -232,6 +232,7 @@ public abstract class WinEffectGadget extends Gadget public void run() { for(Player p : UtilServer.getPlayers()) { UtilPlayer.hideFromAll(p); + p.eject(); p.teleport(loc); p.setGameMode(GameMode.ADVENTURE); p.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, 10 * 20, 1, false, false)); From db59c32b5ecbb1654cda6e3955c84ca6244a14cb Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 22:01:51 -0500 Subject: [PATCH 79/91] PC-1028 --- .../src/mineplex/core/common/util/UtilEnt.java | 1 + .../src/nautilus/game/arcade/game/games/snake/Snake.java | 2 ++ .../nautilus/game/arcade/managers/GameSpectatorManager.java | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java index ccd084a5e..635bedba2 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java @@ -51,6 +51,7 @@ import org.bukkit.util.Vector; public class UtilEnt { public static final String FLAG_NO_REMOVE = "noremove"; + public static final String FLAG_ENTITY_COMPONENT = "component"; //Custom Entity Names private static HashMap _nameMap = new HashMap(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java index 0ac9c65d6..708b8a011 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/Snake.java @@ -133,6 +133,7 @@ public class Snake extends SoloGame this.CreatureAllowOverride = true; Sheep sheep = player.getWorld().spawn(player.getLocation(), Sheep.class); + UtilEnt.addFlag(sheep, UtilEnt.FLAG_ENTITY_COMPONENT); this.CreatureAllowOverride = false; sheep.setColor(DyeColor.getByDyeData((byte) (i % 16))); @@ -447,6 +448,7 @@ public class Snake extends SoloGame //Spawn this.CreatureAllowOverride = true; Sheep tail = loc.getWorld().spawn(loc, Sheep.class); + UtilEnt.addFlag(tail, UtilEnt.FLAG_ENTITY_COMPONENT); this.CreatureAllowOverride = false; tail.setRemoveWhenFarAway(false); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameSpectatorManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameSpectatorManager.java index 21132157e..a5d9aa163 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameSpectatorManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameSpectatorManager.java @@ -2,6 +2,7 @@ package nautilus.game.arcade.managers; import mineplex.core.common.util.C; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; @@ -132,6 +133,9 @@ public class GameSpectatorManager implements Listener, IPacketHandler } } + if (UtilEnt.hasFlag(event.getRightClicked(), UtilEnt.FLAG_ENTITY_COMPONENT)) + return; + if (!_manager.GetGame().IsAlive(player)) { event.setCancelled(true); From e0706f362717d9e8e25bdd7d43f156818feba96c Mon Sep 17 00:00:00 2001 From: samczsun Date: Wed, 15 Mar 2017 20:29:17 -0400 Subject: [PATCH 80/91] PC-1056 --- .../game/arcade/kit/perks/PerkHorsePet.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java index fe636fede..ae8c54f91 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHorsePet.java @@ -13,6 +13,7 @@ import org.bukkit.entity.Horse.Variant; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.inventory.ItemStack; @@ -22,12 +23,15 @@ import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilEnt; +import mineplex.core.common.util.UtilInv; +import mineplex.core.common.util.UtilItem; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilTime; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.gamemodifiers.kits.KitModifier; import mineplex.core.gadget.gadgets.gamemodifiers.kits.KitModifierType; +import mineplex.core.itemstack.ItemBuilder; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.core.utils.UtilVariant; @@ -39,6 +43,8 @@ import nautilus.game.arcade.kit.Perk; public class PerkHorsePet extends Perk { + private static final ItemStack SADDLE_ITEM = new ItemBuilder(Material.SADDLE).setTitle(C.cGreenB + "Saddle").build(); + private HashMap _horseMap = new HashMap(); private HashMap _deathTime = new HashMap(); @@ -98,7 +104,7 @@ public class PerkHorsePet extends Perk horse.setOwner(player); horse.setMaxDomestication(1); horse.setJumpStrength(1); - horse.getInventory().setSaddle(new ItemStack(Material.SADDLE)); + horse.getInventory().setSaddle(SADDLE_ITEM); horse.setMaxHealth(40); horse.setHealth(40); @@ -299,6 +305,22 @@ public class PerkHorsePet extends Perk } } + @EventHandler + public void onClick(InventoryClickEvent event) + { + Horse horse = _horseMap.get(event.getWhoClicked()); + if (horse != null) + { + if (event.getInventory().equals(horse.getInventory())) + { + if (UtilInv.shouldCancelEvent(event, item -> UtilItem.isSimilar(item, SADDLE_ITEM, UtilItem.ItemAttribute.NAME))) + { + event.setCancelled(true); + } + } + } + } + private KitModifier getHorseType(Player player) { GadgetManager gadgetManager = Manager.getCosmeticManager().getGadgetManager(); From 40860ef9a2421209e99018fd3ea8af8c62caf3c4 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 20:09:25 -0500 Subject: [PATCH 81/91] PC-1107 --- .../src/mineplex/core/pet/PetManager.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java index 9eae213a0..72186e7bb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java @@ -298,9 +298,9 @@ public class PetManager extends MiniClientPlugin DisguiseGuardian disguise = new DisguiseGuardian(pet); - if (Get(player).getPets().get(entityType) != null && Get(player).getPets().get(entityType).length() > 0) + if (Get(player).getPets().get(petType) != null && Get(player).getPets().get(petType).length() > 0) { - disguise.setName(Get(player).getPets().get(entityType)); + disguise.setName(Get(player).getPets().get(petType)); disguise.setCustomNameVisible(true); } @@ -315,9 +315,9 @@ public class PetManager extends MiniClientPlugin Zombie zombie = pet.getWorld().spawn(pet.getLocation(), Zombie.class); zombie.setBaby(true); zombie.getEquipment().setHelmet(new ItemStack(Material.PUMPKIN)); - if (Get(player).getPets().get(entityType) != null && Get(player).getPets().get(entityType).length() > 0) + if (Get(player).getPets().get(petType) != null && Get(player).getPets().get(petType).length() > 0) { - zombie.setCustomName(Get(player).getPets().get(entityType)); + zombie.setCustomName(Get(player).getPets().get(petType)); zombie.setCustomNameVisible(true); } disguise.getEntity().getBukkitEntity().setPassenger(zombie); @@ -330,9 +330,9 @@ public class PetManager extends MiniClientPlugin disguiseZombie.setChestplate(new ItemStack(Material.BANNER)); disguiseZombie.setHeldItem(new ItemStack(Material.WOOD_HOE)); - if (Get(player).getPets().get(entityType) != null && Get(player).getPets().get(entityType).length() > 0) + if (Get(player).getPets().get(petType) != null && Get(player).getPets().get(petType).length() > 0) { - disguiseZombie.setName(Get(player).getPets().get(entityType)); + disguiseZombie.setName(Get(player).getPets().get(petType)); disguiseZombie.setCustomNameVisible(true); } @@ -352,9 +352,9 @@ public class PetManager extends MiniClientPlugin UtilEnt.silence(zombie, true); - if (Get(player).getPets().get(entityType) != null && Get(player).getPets().get(entityType).length() > 0) + if (Get(player).getPets().get(petType) != null && Get(player).getPets().get(petType).length() > 0) { - zombie.setCustomName(Get(player).getPets().get(entityType)); + zombie.setCustomName(Get(player).getPets().get(petType)); zombie.setCustomNameVisible(true); } } @@ -367,9 +367,9 @@ public class PetManager extends MiniClientPlugin disguiseVillager.setBaby(); disguiseVillager.setHeldItem(new ItemStack(Material.BOW)); - if (Get(player).getPets().get(entityType) != null && Get(player).getPets().get(entityType).length() > 0) + if (Get(player).getPets().get(petType) != null && Get(player).getPets().get(petType).length() > 0) { - disguiseVillager.setName(Get(player).getPets().get(entityType)); + disguiseVillager.setName(Get(player).getPets().get(petType)); disguiseVillager.setCustomNameVisible(true); } @@ -384,9 +384,9 @@ public class PetManager extends MiniClientPlugin UtilEnt.silence(zombie, true); - if (Get(player).getPets().get(entityType) != null && Get(player).getPets().get(entityType).length() > 0) + if (Get(player).getPets().get(petType) != null && Get(player).getPets().get(petType).length() > 0) { - zombie.setCustomName(Get(player).getPets().get(entityType)); + zombie.setCustomName(Get(player).getPets().get(petType)); zombie.setCustomNameVisible(true); } From 4553a7081f3340072c284ec67340feb4498ed065 Mon Sep 17 00:00:00 2001 From: samczsun Date: Fri, 10 Mar 2017 17:45:30 -0500 Subject: [PATCH 82/91] PC-697 PC-1180 --- .../mineplex/core/TwitchIntegrationFix.java | 126 ++++++++++++++++++ .../bonuses/animations/AnimationCarl.java | 2 +- .../Mineplex.Hub/src/mineplex/hub/Hub.java | 2 + .../src/nautilus/game/arcade/Arcade.java | 2 + 4 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 Plugins/Mineplex.Core/src/mineplex/core/TwitchIntegrationFix.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/TwitchIntegrationFix.java b/Plugins/Mineplex.Core/src/mineplex/core/TwitchIntegrationFix.java new file mode 100644 index 000000000..cd5d97826 --- /dev/null +++ b/Plugins/Mineplex.Core/src/mineplex/core/TwitchIntegrationFix.java @@ -0,0 +1,126 @@ +package mineplex.core; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +import net.minecraft.server.v1_8_R3.EntityPlayer; +import net.minecraft.server.v1_8_R3.PacketPlayInArmAnimation; +import net.minecraft.server.v1_8_R3.PacketPlayInBlockDig; +import net.minecraft.server.v1_8_R3.PacketPlayInBlockPlace; +import net.minecraft.server.v1_8_R3.PacketPlayInEntityAction; +import net.minecraft.server.v1_8_R3.PacketPlayInFlying; +import net.minecraft.server.v1_8_R3.PacketPlayInHeldItemSlot; +import net.minecraft.server.v1_8_R3.PacketPlayInRightClick; +import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity; +import net.minecraft.server.v1_8_R3.PacketPlayOutCloseWindow; +import net.minecraft.server.v1_8_R3.PacketPlayOutOpenWindow; + +import org.bukkit.Location; +import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer; +import org.bukkit.event.EventHandler; +import org.bukkit.event.player.PlayerQuitEvent; + +import mineplex.core.packethandler.IPacketHandler; +import mineplex.core.packethandler.PacketHandler; +import mineplex.core.packethandler.PacketInfo; + +/** + * Why do we need this you ask? + *

+ * In 1.8.x, Mojang added Twitch integration, and in standard Mojang fashion completely broke inventory handling. + *

+ * Specifically, you are able to close an inventory and not actually trigger an InventoryCloseEvent. This kinda breaks + * literally anything relying on that event. + *

+ * So we just add lots of strict checks to make sure they can't do much without closing the inventory + */ +@ReflectivelyCreateMiniPlugin +public class TwitchIntegrationFix extends MiniPlugin implements IPacketHandler +{ + private final Map _inventoryOpenedAt = new HashMap<>(); + private final Map _inventoryOpenedAtTime = new HashMap<>(); + + private TwitchIntegrationFix() + { + super("Twitch Integration Fix"); + + require(PacketHandler.class).addPacketHandler(this, true, + PacketPlayOutOpenWindow.class, + PacketPlayOutCloseWindow.class, + PacketPlayInRightClick.class, + PacketPlayInBlockPlace.class, + PacketPlayInArmAnimation.class, + PacketPlayInBlockDig.class, + PacketPlayInHeldItemSlot.class, + PacketPlayInUseEntity.class, + PacketPlayInFlying.PacketPlayInPosition.class, + PacketPlayInFlying.PacketPlayInPositionLook.class + ); + } + + @EventHandler + public void onQuit(PlayerQuitEvent event) + { + _inventoryOpenedAt.remove(event.getPlayer().getUniqueId()); + _inventoryOpenedAtTime.remove(event.getPlayer().getUniqueId()); + } + + @Override + public void handle(PacketInfo packetInfo) + { + EntityPlayer entityPlayer = ((CraftPlayer) packetInfo.getPlayer()).getHandle(); + if (packetInfo.getPacket() instanceof PacketPlayOutOpenWindow) + { + _inventoryOpenedAt.put(packetInfo.getPlayer().getUniqueId(), packetInfo.getPlayer().getLocation()); + _inventoryOpenedAtTime.put(packetInfo.getPlayer().getUniqueId(), entityPlayer.playerConnection.networkManager.packetCount); + } + else if (packetInfo.getPacket() instanceof PacketPlayOutCloseWindow) + { + _inventoryOpenedAt.remove(packetInfo.getPlayer().getUniqueId()); + _inventoryOpenedAtTime.remove(packetInfo.getPlayer().getUniqueId()); + } + else if (packetInfo.getPacket() instanceof PacketPlayInRightClick || + packetInfo.getPacket() instanceof PacketPlayInBlockPlace || + packetInfo.getPacket() instanceof PacketPlayInArmAnimation || + packetInfo.getPacket() instanceof PacketPlayInBlockDig || + packetInfo.getPacket() instanceof PacketPlayInHeldItemSlot || + packetInfo.getPacket() instanceof PacketPlayInUseEntity + ) + { + // Impossible to do while inventory is open + if (entityPlayer.activeContainer != entityPlayer.defaultContainer && _inventoryOpenedAtTime.containsKey(packetInfo.getPlayer().getUniqueId())) + { + long openedTime = _inventoryOpenedAtTime.get(packetInfo.getPlayer().getUniqueId()); + if (entityPlayer.playerConnection.networkManager.packetCount - openedTime > 5) + { + System.out.println("Impossible packet: " + packetInfo.getPacket().getClass()); + packetInfo.getPlayer().closeInventory(); + } + } + } + else if (packetInfo.getPacket() instanceof PacketPlayInFlying) + { + if (entityPlayer.activeContainer != entityPlayer.defaultContainer) + { + if (_inventoryOpenedAt.containsKey(packetInfo.getPlayer().getUniqueId())) + { + Location openedAt = _inventoryOpenedAt.get(packetInfo.getPlayer().getUniqueId()); + if (!packetInfo.getPlayer().getWorld().equals(openedAt.getWorld())) + { + packetInfo.getPlayer().closeInventory(); + } + else + { + double distance = packetInfo.getPlayer().getLocation().distanceSquared(openedAt); + // You get a 9 block radius before you're considered too far away + if (distance > 9 * 9) + { + packetInfo.getPlayer().closeInventory(); + } + } + } + } + } + } +} diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/animations/AnimationCarl.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/animations/AnimationCarl.java index eadfe6cfc..aeecb152f 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/animations/AnimationCarl.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/animations/AnimationCarl.java @@ -61,7 +61,7 @@ public class AnimationCarl extends Animation if(((String) _type).contentEquals("RANK")) { for (int i = 50; i < 60; i++) - { + { Item shard = _creeper.getWorld().dropItem(_creeper.getLocation().add(0.5, 1.5, 0.5), ItemStackFactory.Instance.CreateStack(Material.PRISMARINE_SHARD, (byte) 0, 1, " " + i)); _items.add(shard); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java index c21256ce4..05b80b2e6 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java @@ -10,6 +10,7 @@ import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.CustomTagFix; import mineplex.core.PacketsInteractionFix; +import mineplex.core.TwitchIntegrationFix; import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; import mineplex.core.antihack.AntiHack; @@ -242,6 +243,7 @@ public class Hub extends JavaPlugin implements IRelation { require(AprilFoolsTreasureHunt.class); } + require(TwitchIntegrationFix.class); } @Override 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 82081472c..68e92af90 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -15,6 +15,7 @@ import mineplex.core.CustomTagFix; import mineplex.core.FoodDupeFix; import mineplex.core.PacketsInteractionFix; import mineplex.core.TimingsFix; +import mineplex.core.TwitchIntegrationFix; import mineplex.core.account.CoreClientManager; import mineplex.core.achievement.AchievementManager; import mineplex.core.antihack.AntiHack; @@ -202,6 +203,7 @@ public class Arcade extends JavaPlugin require(TwoFactorAuth.class); new WebsiteLinkManager(this, _clientManager); + require(TwitchIntegrationFix.class); AprilFoolsManager.getInstance(); From bd1d73d3904edb87bc7729c89a724d252794cef7 Mon Sep 17 00:00:00 2001 From: samczsun Date: Wed, 15 Mar 2017 21:44:27 -0400 Subject: [PATCH 83/91] PC-1181 --- .../core/gadget/gadgets/morph/MorphWither.java | 10 ++++++++++ .../src/mineplex/core/mount/DragonMount.java | 13 +++++++++++++ 2 files changed, 23 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java index 59f9bcb46..503cef717 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphWither.java @@ -17,6 +17,7 @@ import org.bukkit.util.Vector; import mineplex.core.common.Rank; import mineplex.core.common.util.C; +import mineplex.core.common.util.F; import mineplex.core.common.util.LineFormat; import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAlg; @@ -36,6 +37,9 @@ import mineplex.core.gadget.gadgets.morph.managers.UtilMorph; import mineplex.core.gadget.types.MorphGadget; import mineplex.core.inventory.ClientItem; import mineplex.core.inventory.data.Item; +import mineplex.core.mount.DragonMount; +import mineplex.core.mount.Mount; +import mineplex.core.mount.types.MountDragon; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -59,6 +63,12 @@ public class MorphWither extends MorphGadget @Override public void enableCustom(final Player player, boolean message) { + Mount mount = Manager.getMountManager().getActive(player); + if (mount instanceof DragonMount) + { + UtilPlayer.message(player, F.main("Gadget", "You cannot enable the " + F.elem(mount.getName()) + " and the " + F.elem(getName()) + " at the same time")); + Manager.getMountManager().DeregisterAll(player); + } this.applyArmor(player, message); player.setMaxHealth(300); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java index 242e21dfa..beec06662 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonMount.java @@ -3,8 +3,13 @@ package mineplex.core.mount; import org.bukkit.Material; import org.bukkit.entity.Player; +import mineplex.core.Managers; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; +import mineplex.core.gadget.GadgetManager; +import mineplex.core.gadget.gadgets.morph.MorphWither; +import mineplex.core.gadget.types.Gadget; +import mineplex.core.gadget.types.GadgetType; public class DragonMount extends Mount { @@ -18,6 +23,14 @@ public class DragonMount extends Mount @Override public void enableCustom(final Player player) { + GadgetManager gadgetManager = Managers.get(GadgetManager.class); + Gadget morph = gadgetManager.getActive(player, GadgetType.MORPH); + if (morph instanceof MorphWither) + { + UtilPlayer.message(player, F.main("Gadget", "You cannot enable the " + F.elem(getName()) + " and the " + F.elem(morph.getName()) + " at the same time")); + morph.disable(player, true); + } + player.leaveVehicle(); player.eject(); From d69c4b3dca83a87b3030bb79cd468d9333ddbabb Mon Sep 17 00:00:00 2001 From: samczsun Date: Wed, 15 Mar 2017 20:23:22 -0400 Subject: [PATCH 84/91] PC-1189 --- .../game/arcade/managers/GameHostManager.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index 47ea01a43..126bb399b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -12,6 +12,7 @@ import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEvent; @@ -247,6 +248,18 @@ public class GameHostManager implements Listener } } + @EventHandler + public void onClick(InventoryClickEvent event) + { + if (_shop.isPlayerInShop(event.getWhoClicked())) + { + if (event.getClickedInventory().getType() == InventoryType.PLAYER) + { + event.setCancelled(true); + } + } + } + @EventHandler public void adminJoin(PlayerJoinEvent event) { From fceda64a5a18876538bd5cfa823919c955678c41 Mon Sep 17 00:00:00 2001 From: samczsun Date: Mon, 13 Mar 2017 13:50:16 -0400 Subject: [PATCH 85/91] PC-1318 --- .../game/games/dragonescape/DragonEscape.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 20b2fedd9..9646a217c 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 @@ -1,8 +1,10 @@ package nautilus.game.arcade.game.games.dragonescape; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; @@ -200,6 +202,18 @@ public class DragonEscape extends SoloGame this.WorldWaterDamage = 2; } + @Override + public List getWinners() + { + if (GetState().ordinal() >= GameState.End.ordinal()) + { + if (_winner == null) + return Collections.emptyList(); + return Collections.singletonList(_winner); + } + return null; + } + @EventHandler public void SpawnDragon(GameStateChangeEvent event) { From be1e454d5c4af4a93661a7d371b3110eed622cc4 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 19:48:31 -0500 Subject: [PATCH 86/91] PC-696 --- .../src/mineplex/core/mount/types/MountCart.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java index a1f9f5a5b..4f484219c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java @@ -178,7 +178,12 @@ public class MountCart extends Mount> @EventHandler public void cancelBreak(VehicleDamageEvent event) { - if (getActive().values().contains(event.getVehicle())) - event.setCancelled(true); + for (SingleEntityMountData data : getActive().values()) + { + if (data.getEntity().equals(event.getVehicle())) + { + event.setCancelled(true); + } + } } } From 9c9d74f098dacbc0f9ef4a1f2f5e71ed2e7e3f92 Mon Sep 17 00:00:00 2001 From: samczsun Date: Thu, 9 Mar 2017 20:28:16 -0500 Subject: [PATCH 87/91] PC-1394 --- .../src/nautilus/game/arcade/game/Game.java | 2 +- .../src/nautilus/game/arcade/kit/ProgressingKit.java | 2 +- 2 files changed, 2 insertions(+), 2 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 145dec937..ac4e3b419 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 @@ -1128,7 +1128,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed } else if (!(kit instanceof ChampionsKit)) { - player.closeInventory(); +// player.closeInventory(); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java index eabe114f5..fb98b8fce 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java @@ -264,7 +264,7 @@ public abstract class ProgressingKit extends Kit implements ProgressiveKit Player bukkitPlayer = Bukkit.getPlayer(player); bukkitPlayer.sendMessage(F.main("Kit", "Set " + C.cYellowB + getDisplayName() + C.cGray + " as your default kit.")); - bukkitPlayer.closeInventory(); +// bukkitPlayer.closeInventory(); //Undefault any kits and update the DB for (Kit kit : Manager.GetGame().GetKits()) { From 8e92317b9c2a38d66c785c06843143ea5270b59d Mon Sep 17 00:00:00 2001 From: samczsun Date: Sat, 11 Mar 2017 15:30:48 -0500 Subject: [PATCH 88/91] So that's why Tim closed inventories --- .../src/mineplex/core/common/util/UtilPlayer.java | 12 ++++++++++++ .../src/nautilus/game/arcade/game/Game.java | 3 ++- .../src/nautilus/game/arcade/kit/ProgressingKit.java | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java index 3e7d31f3f..bfc5e4ec8 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java @@ -1133,6 +1133,18 @@ public class UtilPlayer player.spigot().sendMessage(textComponent); } + public static void closeInventoryIfOpen(Player player) + { + if (hasOpenInventory(player)) + player.closeInventory(); + } + + public static boolean hasOpenInventory(Player player) + { + EntityPlayer entityPlayer = ((CraftPlayer) player).getHandle(); + return entityPlayer.activeContainer != entityPlayer.defaultContainer; + } + /* * Returns whether the UUID belongs to a slim skin */ 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 ac4e3b419..458b9aedb 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 @@ -42,6 +42,7 @@ import org.bukkit.event.hanging.HangingPlaceEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.world.WorldLoadEvent; +import org.bukkit.inventory.PlayerInventory; import org.bukkit.scoreboard.NameTagVisibility; import org.bukkit.scoreboard.Team; import org.bukkit.util.Vector; @@ -1128,7 +1129,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed } else if (!(kit instanceof ChampionsKit)) { -// player.closeInventory(); + UtilPlayer.closeInventoryIfOpen(player); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java index fb98b8fce..75cf10209 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/ProgressingKit.java @@ -18,6 +18,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.entity.Firework; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.FireworkMeta; import org.bukkit.scheduler.BukkitRunnable; @@ -264,7 +265,7 @@ public abstract class ProgressingKit extends Kit implements ProgressiveKit Player bukkitPlayer = Bukkit.getPlayer(player); bukkitPlayer.sendMessage(F.main("Kit", "Set " + C.cYellowB + getDisplayName() + C.cGray + " as your default kit.")); -// bukkitPlayer.closeInventory(); + UtilPlayer.closeInventoryIfOpen(bukkitPlayer); //Undefault any kits and update the DB for (Kit kit : Manager.GetGame().GetKits()) { From 36f4e6b5a169f74a6a3e6fb8f5667af79a36d4f3 Mon Sep 17 00:00:00 2001 From: samczsun Date: Wed, 15 Mar 2017 17:59:49 -0400 Subject: [PATCH 89/91] Change more closeInventory calls --- .../nautilus/game/arcade/game/games/champions/ChampionsCTF.java | 2 +- .../game/arcade/game/games/champions/ChampionsDominate.java | 2 +- .../nautilus/game/arcade/game/games/champions/ChampionsTDM.java | 2 +- .../nautilus/game/arcade/game/games/common/TeamDeathmatch.java | 2 +- .../src/nautilus/game/arcade/game/games/smash/SuperSmash.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 32855df7d..d419b8c3f 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 @@ -106,7 +106,7 @@ public class ChampionsCTF extends CaptureTheFlag if (GetKit(player) == null) { SetKit(player, GetKits()[2], true); - player.closeInventory(); + UtilPlayer.closeInventoryIfOpen(player); } } 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 52763c8a3..226a3e364 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 @@ -98,7 +98,7 @@ public class ChampionsDominate extends Domination if (GetKit(player) == null) { SetKit(player, GetKits()[2], true); - player.closeInventory(); + UtilPlayer.closeInventoryIfOpen(player); } } 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 8baa4a01c..f8d62e341 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 @@ -98,7 +98,7 @@ public class ChampionsTDM extends TeamDeathmatch if (GetKit(player) == null) { SetKit(player, GetKits()[2], true); - player.closeInventory(); + UtilPlayer.closeInventoryIfOpen(player); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java index 7beb30f63..293047672 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/TeamDeathmatch.java @@ -196,7 +196,7 @@ public class TeamDeathmatch extends TeamGame if (GetKit(player) == null) { SetKit(player, GetKits()[2], true); - player.closeInventory(); + UtilPlayer.closeInventoryIfOpen(player); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java index a121545f2..ba21dfd17 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java @@ -511,7 +511,7 @@ public abstract class SuperSmash extends Game if (announce) { - player.closeInventory(); + UtilPlayer.closeInventoryIfOpen(player); player.playSound(player.getLocation(), Sound.ORB_PICKUP, 2f, 1f); UtilPlayer.message(player, F.main("Kit", "You equipped " + F.elem(kit.GetFormattedName() + " Kit") + ".")); kit.ApplyKit(player); From 0cc7a078c60e6cedaf4d69fb8bad51e097bfe1f0 Mon Sep 17 00:00:00 2001 From: samczsun Date: Tue, 4 Apr 2017 19:27:18 -0400 Subject: [PATCH 90/91] Fix bad logic in TeamArmorModule --- .../game/arcade/game/modules/TeamArmorModule.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/TeamArmorModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/TeamArmorModule.java index e158fd9d9..14c77260e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/TeamArmorModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/TeamArmorModule.java @@ -19,6 +19,7 @@ import mineplex.core.common.util.UtilItem; import mineplex.core.itemstack.ItemBuilder; import nautilus.game.arcade.events.PlayerKitGiveEvent; +import nautilus.game.arcade.game.GameTeam; /** * This module handles setting armor for team games such as Micro Battles. It allows you to set the player's armor @@ -67,11 +68,15 @@ public class TeamArmorModule extends Module public void apply(Player player) { - Color color = getGame().GetTeam(player).GetColorBase(); + GameTeam gameTeam = getGame().GetTeam(player); + if (gameTeam == null) + return; + + Color color = gameTeam.GetColorBase(); if (_giveTeamArmor) { - String itemName = getGame().GetTeam(player).GetColor() + C.Bold + "Team Armor"; + String itemName = gameTeam.GetColor() + C.Bold + "Team Armor"; _armorNames.add(itemName); player.getInventory().setHelmet(new ItemBuilder(Material.LEATHER_HELMET).setColor(color).setTitle(itemName).setUnbreakable(true).build()); player.getInventory().setChestplate(new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(color).setTitle(itemName).setUnbreakable(true).build()); @@ -81,7 +86,7 @@ public class TeamArmorModule extends Module if (_giveHotbarItem && getGame().InProgress()) { - String teamName = getGame().GetTeam(player).GetFormattedName(); + String teamName = gameTeam.GetFormattedName(); _hotbarNames.add(teamName); player.getInventory().setItem(8, new ItemBuilder(Material.LEATHER_CHESTPLATE).setColor(color).setTitle(teamName).setUnbreakable(true).build()); } From 08bd17afe69aeb8ae313319cfaa8201dbeb339c5 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 3 Apr 2017 20:36:27 +0100 Subject: [PATCH 91/91] Fix a chat formatting problem --- .../src/nautilus/game/arcade/managers/chat/GameChatManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java index 047e69531..69e9958d2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/chat/GameChatManager.java @@ -109,7 +109,7 @@ public class GameChatManager implements Listener else rankStr = C.cDGreen + C.Bold + "MPS Co-Host " + C.Reset; } - else + else if (rank != Rank.ALL) { rankStr = rank.getTag(true, true) + " " + C.Reset; }