JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Chiss 2014-04-13 18:01:55 +10:00
parent 9874dae60f 5efaf9bd36
commit 5df8d34426
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
View File

@ -27,7 +27,7 @@ import mineplex.minecraft.game.classcombat.Skill.SkillFactory;
public class ClientClass
{
public static int MAX_TOKENS = 12;
public static int MAX_TOKENS = 60;
private ClassManager _classFactory;
private SkillFactory _skillFactory;
@ -364,11 +364,6 @@ public class ClientClass
ClearSkills();
_gameClass = gameClass;
if (_gameClass == null)
return;
EquipCustomBuild(_customBuilds.get(gameClass).get(0));
}
public IPvpClass GetGameClass()

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitAssassin.java
View File

@ -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());

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitBrute.java
View File

@ -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());

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitKnight.java
View File

@ -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());

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitMage.java
View File

@ -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());

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/kits/KitRanger.java
View File

@ -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());