From 00c8aea422174237f453e90c6f3d74c46a9cadae Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Sat, 9 Sep 2017 12:51:35 -0400 Subject: [PATCH 1/3] Fix tracking of Heroes of GWEN chests --- .../staffServer/customerSupport/CustomerSupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java index 20419a1d7..55dbd6681 100644 --- a/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java +++ b/Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java @@ -422,9 +422,9 @@ public class CustomerSupport extends MiniPlugin implements ResultSetCallable { if (transaction.Coins == 0 && transaction.Gems == 0) { - if (transaction.SalesPackageName.split(" ").length == 4) - hogChestReceived += Integer.parseInt(transaction.SalesPackageName.split(" ")[3]); - else if (transaction.SalesPackageName.split(" ").length == 3) + if (transaction.SalesPackageName.split(" ").length == 3) + hogChestReceived += Integer.parseInt(transaction.SalesPackageName.split(" ")[2]); + else if (transaction.SalesPackageName.split(" ").length == 2) hogChestReceived += 1; } } From 5ed7be68d925a278625c684eff825225065dc8b8 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 9 Sep 2017 18:30:37 +0100 Subject: [PATCH 2/3] Fix invincibility --- .../game/arcade/game/games/moba/util/MobaUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/util/MobaUtil.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/util/MobaUtil.java index 301d8deed..78cd7f6ea 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/util/MobaUtil.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/util/MobaUtil.java @@ -211,14 +211,17 @@ public class MobaUtil public static void setTeamEntity(LivingEntity entity, GameTeam team) { - UtilEnt.addFlag(entity, MobaConstants.TEAM_METADATA + team.GetName()); + UtilEnt.SetMetadata(entity, MobaConstants.TEAM_METADATA, team.GetName()); } public static boolean isTeamEntity(LivingEntity entity, GameTeam team) { - return UtilEnt.hasFlag(entity, MobaConstants.TEAM_METADATA + team.GetName()); + String metadata = UtilEnt.GetMetadata(entity, MobaConstants.TEAM_METADATA); + + return metadata != null && metadata.equals(team.GetName()); } + public static void heal(LivingEntity entity, Player source, double health) { if (entity instanceof Player) From fc258d95b93880ac54b2182170542594f0fba51e Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 9 Sep 2017 18:30:46 +0100 Subject: [PATCH 3/3] Fix infinite slowness --- .../game/arcade/game/games/moba/buff/buffs/BuffRooting.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/buff/buffs/BuffRooting.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/buff/buffs/BuffRooting.java index 988dc8089..bf72d7f56 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/buff/buffs/BuffRooting.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/buff/buffs/BuffRooting.java @@ -32,7 +32,7 @@ public class BuffRooting extends Buff public void onApply() { UtilAction.zeroVelocity(_entity); - _entity.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, Integer.MAX_VALUE, 3)); + _entity.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (_duration / 50D), 3)); UtilTextMiddle.display("", C.cRed + "Rooted", 10, 20, 10, (Player) _entity); }