Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/master

This commit is contained in:
Jonathan Williams 2013-08-30 20:58:27 -07:00
commit 63b3cf501f
11 changed files with 5 additions and 10 deletions

View File

@ -46,6 +46,7 @@ public class KitArcher extends Kit
}
@Override
public void SpawnCustom(LivingEntity ent)
{
ent.getEquipment().setHelmet(new ItemStack(Material.CHAINMAIL_HELMET));
ent.getEquipment().setChestplate(new ItemStack(Material.CHAINMAIL_CHESTPLATE));

View File

@ -46,6 +46,7 @@ public class KitCoward extends Kit
}
@Override
public void SpawnCustom(LivingEntity ent)
{
ent.getEquipment().setHelmet(new ItemStack(Material.LEATHER_HELMET));
ent.getEquipment().setChestplate(new ItemStack(Material.LEATHER_CHESTPLATE));

View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.minigames.quiver.kits;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.minigames.quiver.kits;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.minigames.quiver.kits;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -28,7 +27,7 @@ public class KitLeaper extends Kit
new Perk[]
{
new PerkLeaper("Leap", 1.2, 1.0, 8000)
new PerkLeap("Leap", 1.2, 1.0, 8000)
},
EntityType.ZOMBIE,
new ItemStack(Material.IRON_AXE));

View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.minigames.turfforts.kits;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.minigames.turfforts.kits;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

View File

@ -1,7 +1,6 @@
package nautilus.game.arcade.game.minigames.turfforts.kits;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

View File

@ -2,7 +2,6 @@ package nautilus.game.arcade.game.standalone.castlesiege.kits;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.inventory.ItemStack;

View File

@ -26,7 +26,7 @@ public class KitSurvivorRogue extends Kit
new Perk[]
{
new PerkLeaper("Leap", 1, 1, 8000),
new PerkLeap("Leap", 1, 1, 8000),
new PerkSpeed(0)
},
EntityType.ZOMBIE,

View File

@ -29,7 +29,7 @@ public class KitUndeadAlpha extends Kit
new Perk[]
{
new PerkLeaper("Leap", 1, 1, 8000),
new PerkLeap("Leap", 1, 1, 8000),
new PerkStrength(2),
new PerkIronSkin(2),
new PerkRegeneration(1)