From 1378ddd71f00724a4d7fe2e70b64eed85b7377b6 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 3 Aug 2018 23:14:26 +0100 Subject: [PATCH] Fix some bugs --- .../src/mineplex/game/clans/Clans.java | 4 +- .../game/clans/clans/ClanEnergyManager.java | 54 ++++++++----------- .../game/clans/clans/ClansManager.java | 2 +- .../classcombat/Skill/Assassin/Blink.java | 2 +- .../classcombat/Skill/Assassin/Evade.java | 2 +- .../classcombat/Skill/Assassin/Flash.java | 2 +- .../classcombat/Skill/Assassin/Illusion.java | 2 +- .../game/classcombat/Skill/Assassin/Leap.java | 2 +- .../Skill/Assassin/MarkedForDeath.java | 2 +- .../classcombat/Skill/Assassin/Recall.java | 2 +- .../Skill/Assassin/SilencingArrow.java | 2 +- .../Skill/Assassin/SmokeArrow.java | 2 +- .../classcombat/Skill/Assassin/SmokeBomb.java | 2 +- .../classcombat/Skill/Brute/BlockToss.java | 2 +- .../classcombat/Skill/Brute/DwarfToss.java | 2 +- .../classcombat/Skill/Brute/FleshHook.java | 2 +- .../classcombat/Skill/Brute/SeismicSlam.java | 2 +- .../classcombat/Skill/Brute/Takedown.java | 2 +- .../game/classcombat/Skill/Brute/Taunt.java | 2 +- .../classcombat/Skill/Brute/WhirlwindAxe.java | 2 +- .../game/classcombat/Skill/Global/Pistol.java | 2 +- .../classcombat/Skill/Knight/AxeThrow.java | 2 +- .../classcombat/Skill/Knight/BullsCharge.java | 2 +- .../Skill/Knight/DefensiveStance.java | 2 +- .../classcombat/Skill/Knight/HiltSmash.java | 6 +-- .../Skill/Knight/HoldPosition.java | 2 +- .../classcombat/Skill/Knight/PowerChop.java | 2 +- .../classcombat/Skill/Knight/Riposte.java | 2 +- .../classcombat/Skill/Knight/ShieldSmash.java | 2 +- .../classcombat/Skill/Mage/ArcticArmor.java | 13 +++-- .../game/classcombat/Skill/Mage/Blizzard.java | 2 +- .../classcombat/Skill/Mage/FireBlast.java | 2 +- .../game/classcombat/Skill/Mage/Fissure.java | 2 +- .../classcombat/Skill/Mage/FreezingBlast.java | 2 +- .../classcombat/Skill/Mage/GlacialBlade.java | 2 +- .../classcombat/Skill/Mage/IcePrison.java | 2 +- .../game/classcombat/Skill/Mage/Inferno.java | 2 +- .../classcombat/Skill/Mage/LightningOrb.java | 2 +- .../game/classcombat/Skill/Mage/Rupture.java | 2 +- .../game/classcombat/Skill/Mage/Void.java | 2 +- .../classcombat/Skill/Ranger/Agility.java | 2 +- .../classcombat/Skill/Ranger/Disengage.java | 2 +- .../Skill/Ranger/ExplosiveShot.java | 2 +- .../classcombat/Skill/Ranger/HealingShot.java | 2 +- .../Skill/Ranger/IncendiaryShot.java | 2 +- .../classcombat/Skill/Ranger/NapalmShot.java | 2 +- .../classcombat/Skill/Ranger/PinDown.java | 2 +- .../classcombat/Skill/Ranger/WolfsFury.java | 2 +- .../game/classcombat/Skill/Skill.java | 15 ++++-- 49 files changed, 90 insertions(+), 90 deletions(-) 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 af7535c65..48891dca3 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java @@ -77,8 +77,8 @@ import net.minecraft.server.v1_8_R3.MinecraftServer; public class Clans extends JavaPlugin { - public static final String MAP = "Season 5"; - + + private static final String MAP = "Season 5.5"; public static boolean HARDCORE = false; // Modules diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java index 2a42c0ae1..afeb46731 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyManager.java @@ -1,37 +1,45 @@ package mineplex.game.clans.clans; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; +import com.mineplex.clansqueue.common.ClansQueueMessenger; +import com.mineplex.clansqueue.common.messages.QueuePauseUpdateMessage; import mineplex.core.MiniPlugin; -import mineplex.core.account.CoreClientManager; -import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; -import mineplex.core.donation.DonationManager; +import mineplex.core.common.util.UtilServer; import mineplex.game.clans.core.ClaimLocation; -import mineplex.game.clans.shop.energy.EnergyShop; public class ClanEnergyManager extends MiniPlugin implements Runnable { - private ClansManager _clansManager; - private DonationManager _donationManager; - private EnergyShop _shop; + + private final ClansManager _clansManager; + private boolean _paused; private int tickCount; - public ClanEnergyManager(JavaPlugin plugin, ClansManager clansManager, CoreClientManager clientManager, DonationManager donationManager) + public ClanEnergyManager(ClansManager clansManager) { - super("Clan Energy", plugin); + super("Clan Energy"); + _clansManager = clansManager; - _donationManager = donationManager; - _shop = new EnergyShop(this, clientManager, donationManager); // Wait 5 seconds and then tick every 60 seconds _plugin.getServer().getScheduler().runTaskTimer(_plugin, this, 20 * 5, 20 * 60); + ClansQueueMessenger.getMessenger(UtilServer.getServerName()).registerListener(QueuePauseUpdateMessage.class, (pause, origin) -> + { + if (pause.ServerName.equals(UtilServer.getServerName())) + { + _paused = pause.Paused; + } + }); } @Override public void run() { + if (_paused) + { + return; + } + tickCount++; for (final ClanInfo clanInfo : _clansManager.getClanMap().values()) @@ -55,30 +63,12 @@ public class ClanEnergyManager extends MiniPlugin implements Runnable clanInfo.adjustEnergy(-energyPerMinute); if (tickCount % 5 == 0 && energyPerMinute > 0) { - runAsync(new Runnable() - { - @Override - public void run() - { - _clansManager.getClanDataAccess().updateEnergy(clanInfo); - } - }); + runAsync(() -> _clansManager.getClanDataAccess().updateEnergy(clanInfo)); } } } } - public void purchaseEnergy(Player player, ClanInfo clanInfo, int energy, Callback callback) - { - - - } - - public void openShop(Player player) - { - _shop.attemptShopOpen(player); - } - public ClansManager getClansManager() { return _clansManager; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java index aae5a1588..f61949ccc 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java @@ -439,7 +439,7 @@ public class ClansManager extends MiniClientPlugin implements IRelat ClassShopManager shopManager = new ClassShopManager(plugin, _classManager, skillManager, itemFactory, achievementManager, _clientManager); _classShop = new ClassCombatShop(shopManager, _clientManager, donationManager, true, "Class Shop"); - new ClanEnergyManager(plugin, this, clientManager, donationManager); + new ClanEnergyManager(this); _playTracker = new Playtime(this, statsManager); 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 4d54cff6e..3b2ff151b 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 @@ -74,7 +74,7 @@ public class Blink extends SkillActive UtilPlayer.message(player, F.main(GetClassType().name(), "You cannot use " + F.skill(GetName()) + " while Slowed.")); return false; } - else if (UtilEnt.isInWater(player)) + else if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java index 9f5e36ced..700c54c3f 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Evade.java @@ -64,7 +64,7 @@ public class Evade extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java index eaa8f88f2..e8af06814 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Flash.java @@ -78,7 +78,7 @@ public class Flash extends SkillActive return false; } - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java index 58b997422..0c8fcac62 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java @@ -77,7 +77,7 @@ public class Illusion extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java index 62bddb491..dadc3d69f 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Leap.java @@ -56,7 +56,7 @@ public class Leap extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java index d524cfb88..cc7542749 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/MarkedForDeath.java @@ -63,7 +63,7 @@ public class MarkedForDeath extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main(GetClassType().name(), "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java index ee5f07b5d..6264b6fc3 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Recall.java @@ -83,7 +83,7 @@ public class Recall extends Skill return; } - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { player.sendMessage(F.main("Skill", "You cannot use " + F.skill(GetName()) +" while in water.")); return; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SilencingArrow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SilencingArrow.java index 5632cd2bd..3fe10ab7c 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SilencingArrow.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SilencingArrow.java @@ -63,7 +63,7 @@ public class SilencingArrow extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeArrow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeArrow.java index 1df20b55c..5a7d8c630 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeArrow.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeArrow.java @@ -59,7 +59,7 @@ public class SmokeArrow extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main(GetClassType().name(), "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeBomb.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeBomb.java index e36a095a0..8c7a879c1 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeBomb.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/SmokeBomb.java @@ -78,7 +78,7 @@ public class SmokeBomb extends Skill if (trigger.IsCancelled()) return; - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java index 77ff977ed..f0ea910b4 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java @@ -129,7 +129,7 @@ public class BlockToss extends SkillCharge implements IThrown return; //Water - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java index b78df941f..b1a009bfe 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/DwarfToss.java @@ -91,7 +91,7 @@ public class DwarfToss extends SkillActive int level = getLevel(player); if (level == 0) return false; - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java index 478c61c96..eefdd236c 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/FleshHook.java @@ -62,7 +62,7 @@ public class FleshHook extends SkillActiveCharge implements IThrown @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java index e47fd6ab0..ca7cd0257 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/SeismicSlam.java @@ -88,7 +88,7 @@ public class SeismicSlam extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Takedown.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Takedown.java index 9a35ce87c..6d27af372 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Takedown.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Takedown.java @@ -59,7 +59,7 @@ public class Takedown extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java index 8d554a8dd..8f7ff88ce 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/Taunt.java @@ -58,7 +58,7 @@ public class Taunt extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/WhirlwindAxe.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/WhirlwindAxe.java index 1cb8da875..9efb215f3 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/WhirlwindAxe.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/WhirlwindAxe.java @@ -54,7 +54,7 @@ public class WhirlwindAxe extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Pistol.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Pistol.java index 6bac3bf6f..e494d72fc 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Pistol.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Global/Pistol.java @@ -44,7 +44,7 @@ public class Pistol extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java index 8f37a644b..932c58d02 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/AxeThrow.java @@ -67,7 +67,7 @@ public class AxeThrow extends SkillActive implements IThrown @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java index 6cb4c5d03..58839c09f 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/BullsCharge.java @@ -54,7 +54,7 @@ public class BullsCharge extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/DefensiveStance.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/DefensiveStance.java index 3b0298e60..b07436071 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/DefensiveStance.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/DefensiveStance.java @@ -87,7 +87,7 @@ public class DefensiveStance extends SkillActive if (event.GetCause() != DamageCause.ENTITY_ATTACK && event.GetCause() != DamageCause.PROJECTILE) return; - if (UtilEnt.isInWater(event.GetDamageeEntity())) + if (isInWater(event.GetDamageeEntity())) return; Player damagee = event.GetDamageePlayer(); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HiltSmash.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HiltSmash.java index a0c33bcd7..b33deafcf 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HiltSmash.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HiltSmash.java @@ -54,7 +54,7 @@ public class HiltSmash extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; @@ -103,7 +103,7 @@ public class HiltSmash extends SkillActive return false; //Water - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; @@ -119,7 +119,7 @@ public class HiltSmash extends SkillActive if (event.isCancelled()) return; - if (UtilEnt.isInWater(event.getPlayer())) + if (isInWater(event.getPlayer())) return; Player player = event.getPlayer(); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java index 816e26100..50da82d6a 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/HoldPosition.java @@ -58,7 +58,7 @@ public class HoldPosition extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/PowerChop.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/PowerChop.java index 28ff6c3cd..66679a5e1 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/PowerChop.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/PowerChop.java @@ -52,7 +52,7 @@ public class PowerChop extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java index abaebc773..5e5be5e39 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/Riposte.java @@ -60,7 +60,7 @@ public class Riposte extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/ShieldSmash.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/ShieldSmash.java index 78196ab83..a15712b34 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/ShieldSmash.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Knight/ShieldSmash.java @@ -48,7 +48,7 @@ public class ShieldSmash extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java index 7524f2835..39f62c816 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/ArcticArmor.java @@ -177,11 +177,12 @@ public class ArcticArmor extends Skill Location playerLocation = player.getLocation(); Block playerBlock = playerLocation.getBlock(); + Location moveTo = null; // Force players up if they try and get themselves stuck if (playerBlock.equals(block)) { - player.teleport(playerLocation.add(0, 1, 0)); + moveTo = playerLocation.add(0, 1, 0); } else { @@ -193,16 +194,20 @@ public class ArcticArmor extends Skill if (UtilBlock.isFence(nextBlock) && playerBlock.equals(nextBlock) && Math.abs(playerLocation.getX() - blockLocation.getX()) < FENCE_FROM_CENTER_DIST && Math.abs(playerLocation.getZ() - blockLocation.getZ()) < FENCE_FROM_CENTER_DIST) { - Location moveTo = block.getLocation().add(0.5, 1, 0.5); + moveTo = block.getLocation().add(0.5, 1, 0.5); moveTo.setYaw(playerLocation.getYaw()); moveTo.setPitch(playerLocation.getPitch()); - - player.teleport(moveTo); break; } } } + + // Only move the player if they are being moved into air + if (moveTo != null && moveTo.getBlock().getType() == Material.AIR) + { + player.teleport(moveTo); + } } Factory.BlockRestore().add(block, 79, (byte) 0, (long) (duration * (1 + scale))); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java index ddff48e8e..e2c4e9217 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Blizzard.java @@ -69,7 +69,7 @@ public class Blizzard extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java index 01acd2fb2..64250778d 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FireBlast.java @@ -49,7 +49,7 @@ public class FireBlast extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Fissure.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Fissure.java index 5c946ee6a..fbf1119fb 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Fissure.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Fissure.java @@ -54,7 +54,7 @@ public class Fissure extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java index 0639f5ae7..a3fe9c2ee 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/FreezingBlast.java @@ -55,7 +55,7 @@ public class FreezingBlast extends SkillActive implements IThrown @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java index c2312caa6..1250af833 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/GlacialBlade.java @@ -57,7 +57,7 @@ public class GlacialBlade extends SkillActive implements IThrown else if (Factory.Relation().canHurt(cur, player)) return false; - return !UtilEnt.isInWater(player); + return !isInWater(player); } @Override diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java index 05b53b9f5..96608831c 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/IcePrison.java @@ -56,7 +56,7 @@ public class IcePrison extends SkillActive implements IThrown @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; 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 338ef756a..b78f4b6f6 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 @@ -63,7 +63,7 @@ public class Inferno extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " .in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java index b36d07c10..c27b0ac1b 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/LightningOrb.java @@ -90,7 +90,7 @@ public class LightningOrb extends SkillActive implements IThrown @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java index 581936529..bf52ae06c 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java @@ -83,7 +83,7 @@ public class Rupture extends SkillActiveCharge @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java index 53497b7b3..0e1cbb100 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Void.java @@ -120,7 +120,7 @@ public class Void extends Skill if (!_active.contains(cur)) continue; - if (UtilEnt.isInWater(cur)) + if (isInWater(cur)) { UtilPlayer.message(cur, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); _active.remove(cur); diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Agility.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Agility.java index 0b5836035..4e66f7220 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Agility.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Agility.java @@ -58,7 +58,7 @@ public class Agility extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java index e74993102..4548286ca 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/Disengage.java @@ -61,7 +61,7 @@ public class Disengage extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java index d4f3476fb..a4d4a2244 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/ExplosiveShot.java @@ -73,7 +73,7 @@ public class ExplosiveShot extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java index 99e99f45d..b20173c3e 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/HealingShot.java @@ -66,7 +66,7 @@ public class HealingShot extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/IncendiaryShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/IncendiaryShot.java index e7db354b0..5a7ca6319 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/IncendiaryShot.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/IncendiaryShot.java @@ -59,7 +59,7 @@ // @Override // public boolean CustomCheck(Player player, int level) // { -// if (UtilEnt.isInWater(player)) +// if (isInWater(player)) // { // UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(getName()) + " in water.")); // return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java index 0008a48ac..304b1381f 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/NapalmShot.java @@ -70,7 +70,7 @@ public class NapalmShot extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/PinDown.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/PinDown.java index 3fdbecf97..af76d7e1c 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/PinDown.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/PinDown.java @@ -60,7 +60,7 @@ public class PinDown extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsFury.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsFury.java index cc1eee5e1..dc298e7a0 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsFury.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/WolfsFury.java @@ -68,7 +68,7 @@ public class WolfsFury extends SkillActive @Override public boolean CustomCheck(Player player, int level) { - if (UtilEnt.isInWater(player)) + if (isInWater(player)) { UtilPlayer.message(player, F.main("Skill", "You cannot use " + F.skill(GetName()) + " in water.")); return false; diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java index 58ebd9315..aeb3c9997 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java @@ -14,6 +14,7 @@ import mineplex.minecraft.game.classcombat.Skill.repository.token.SkillToken; import org.bukkit.Material; import org.bukkit.Sound; +import org.bukkit.block.Block; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -343,11 +344,6 @@ public abstract class Skill implements ISkill, Listener player.playSound(player.getLocation(), Sound.NOTE_PIANO, 0.5f, 0.5f + (amount * 1.5f)); } - public void ResetProgress(Player player) - { - - } - public void setAchievementSkill(boolean var) { _isAchievementSkill = var; @@ -370,4 +366,13 @@ public abstract class Skill implements ISkill, Listener { return _locationFilter; } + + protected boolean isInWater(Entity entity) + { + // Unfortunately we cannot use the nms inWater for the entity. Why? + // Well inWater becomes false if the player tries to get out of the water vertically. + // This leads to abilities being used in water which is bad news for Clans. + Block block = entity.getLocation().getBlock(); + return block.getType() == Material.WATER || block.getType() == Material.STATIONARY_WATER; + } } \ No newline at end of file