Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts: Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
This commit is contained in:
commit
5df8d34426
|
@ -27,7 +27,7 @@ import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
|
||||||
|
|
||||||
public class ClientClass
|
public class ClientClass
|
||||||
{
|
{
|
||||||
public static int MAX_TOKENS = 12;
|
public static int MAX_TOKENS = 60;
|
||||||
|
|
||||||
private ClassManager _classFactory;
|
private ClassManager _classFactory;
|
||||||
private SkillFactory _skillFactory;
|
private SkillFactory _skillFactory;
|
||||||
|
@ -364,11 +364,6 @@ public class ClientClass
|
||||||
ClearSkills();
|
ClearSkills();
|
||||||
|
|
||||||
_gameClass = gameClass;
|
_gameClass = gameClass;
|
||||||
|
|
||||||
if (_gameClass == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
EquipCustomBuild(_customBuilds.get(gameClass).get(0));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public IPvpClass GetGameClass()
|
public IPvpClass GetGameClass()
|
||||||
|
|
|
@ -56,6 +56,7 @@ public class KitAssassin extends Kit
|
||||||
clientClass.SetGameClass(pvpClass);
|
clientClass.SetGameClass(pvpClass);
|
||||||
pvpClass.ApplyArmor(player);
|
pvpClass.ApplyArmor(player);
|
||||||
clientClass.ClearDefaults();
|
clientClass.ClearDefaults();
|
||||||
|
clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
|
||||||
|
|
||||||
if (!Manager.GetGame().InProgress())
|
if (!Manager.GetGame().InProgress())
|
||||||
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
||||||
|
|
|
@ -55,6 +55,7 @@ public class KitBrute extends Kit
|
||||||
clientClass.SetGameClass(pvpClass);
|
clientClass.SetGameClass(pvpClass);
|
||||||
pvpClass.ApplyArmor(player);
|
pvpClass.ApplyArmor(player);
|
||||||
clientClass.ClearDefaults();
|
clientClass.ClearDefaults();
|
||||||
|
clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
|
||||||
|
|
||||||
if (!Manager.GetGame().InProgress())
|
if (!Manager.GetGame().InProgress())
|
||||||
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
||||||
|
|
|
@ -52,6 +52,7 @@ public class KitKnight extends Kit
|
||||||
clientClass.SetGameClass(pvpClass);
|
clientClass.SetGameClass(pvpClass);
|
||||||
pvpClass.ApplyArmor(player);
|
pvpClass.ApplyArmor(player);
|
||||||
clientClass.ClearDefaults();
|
clientClass.ClearDefaults();
|
||||||
|
clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
|
||||||
|
|
||||||
if (!Manager.GetGame().InProgress())
|
if (!Manager.GetGame().InProgress())
|
||||||
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
||||||
|
|
|
@ -52,6 +52,7 @@ public class KitMage extends Kit
|
||||||
clientClass.SetGameClass(pvpClass);
|
clientClass.SetGameClass(pvpClass);
|
||||||
pvpClass.ApplyArmor(player);
|
pvpClass.ApplyArmor(player);
|
||||||
clientClass.ClearDefaults();
|
clientClass.ClearDefaults();
|
||||||
|
clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
|
||||||
|
|
||||||
if (!Manager.GetGame().InProgress())
|
if (!Manager.GetGame().InProgress())
|
||||||
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
||||||
|
|
|
@ -52,6 +52,7 @@ public class KitRanger extends Kit
|
||||||
clientClass.SetGameClass(pvpClass);
|
clientClass.SetGameClass(pvpClass);
|
||||||
pvpClass.ApplyArmor(player);
|
pvpClass.ApplyArmor(player);
|
||||||
clientClass.ClearDefaults();
|
clientClass.ClearDefaults();
|
||||||
|
clientClass.EquipCustomBuild(clientClass.GetCustomBuilds(pvpClass).get(0));
|
||||||
|
|
||||||
if (!Manager.GetGame().InProgress())
|
if (!Manager.GetGame().InProgress())
|
||||||
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
clientClass.SetActiveCustomBuild(pvpClass, pvpClass.getDefaultBuild());
|
||||||
|
|
Loading…
Reference in New Issue