From 5efaf9bd363aeb9ee907e2d78ef6808eaa8a1c55 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sun, 13 Apr 2014 00:59:55 -0700 Subject: [PATCH] Fixed inf loop. --- .../minecraft/game/classcombat/Class/ClientClass.java | 5 ----- .../game/arcade/game/games/champions/kits/KitAssassin.java | 1 + .../game/arcade/game/games/champions/kits/KitBrute.java | 1 + .../game/arcade/game/games/champions/kits/KitKnight.java | 1 + .../game/arcade/game/games/champions/kits/KitMage.java | 1 + .../game/arcade/game/games/champions/kits/KitRanger.java | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java index c75363128..ad84a3c62 100644 --- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java +++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java @@ -364,11 +364,6 @@ public class ClientClass ClearSkills(); _gameClass = gameClass; - - if (_gameClass == null) - return; - - EquipCustomBuild(_customBuilds.get(gameClass).get(1)); } public IPvpClass GetGameClass() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java index 159f99c92..d4cfea278 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java @@ -56,6 +56,7 @@ public class KitAssassin extends Kit clientClass.SetGameClass(pvpClass); pvpClass.ApplyArmor(player); clientClass.ClearDefaults(); + clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0)); if (!Manager.GetGame().InProgress()) clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java index 700907c62..5a2be1d98 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java @@ -55,6 +55,7 @@ public class KitBrute extends Kit clientClass.SetGameClass(pvpClass); pvpClass.ApplyArmor(player); clientClass.ClearDefaults(); + clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0)); if (!Manager.GetGame().InProgress()) clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java index 5fc315885..ac5b4a581 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java @@ -52,6 +52,7 @@ public class KitKnight extends Kit clientClass.SetGameClass(pvpClass); pvpClass.ApplyArmor(player); clientClass.ClearDefaults(); + clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0)); if (!Manager.GetGame().InProgress()) clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java index c85c05d33..175496916 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java @@ -52,6 +52,7 @@ public class KitMage extends Kit clientClass.SetGameClass(pvpClass); pvpClass.ApplyArmor(player); clientClass.ClearDefaults(); + clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0)); if (!Manager.GetGame().InProgress()) clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java index e2513ddec..0db49711a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java @@ -52,6 +52,7 @@ public class KitRanger extends Kit clientClass.SetGameClass(pvpClass); pvpClass.ApplyArmor(player); clientClass.ClearDefaults(); + clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0)); if (!Manager.GetGame().InProgress()) clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());