From fb592640a1fa398f25034447e531bb99588092ef Mon Sep 17 00:00:00 2001 From: Chiss Date: Sat, 31 Aug 2013 13:47:48 +1000 Subject: [PATCH] Fixed various merge errors. (Updates) --- .../game/arcade/game/minigames/deathtag/kits/KitArcher.java | 1 + .../game/arcade/game/minigames/dragons/kits/KitCoward.java | 1 + .../game/arcade/game/minigames/quiver/kits/KitBrawler.java | 1 - .../arcade/game/minigames/quiver/kits/KitElementalist.java | 1 - .../game/arcade/game/minigames/quiver/kits/KitLeaper.java | 3 +-- .../arcade/game/minigames/turfforts/kits/KitInfiltrator.java | 1 - .../game/arcade/game/minigames/turfforts/kits/KitMarksman.java | 1 - .../game/arcade/game/minigames/turfforts/kits/KitShredder.java | 1 - .../game/standalone/castlesiege/kits/KitHumanPeasant.java | 1 - .../game/standalone/zombiesurvival/kits/KitSurvivorRogue.java | 2 +- .../game/standalone/zombiesurvival/kits/KitUndeadAlpha.java | 2 +- 11 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java index c70fb2a22..96d6f66ce 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/deathtag/kits/KitArcher.java @@ -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)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java index 2678d6c4b..74c8b7a27 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/dragons/kits/KitCoward.java @@ -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)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java index b1a2cd7b9..859b133b1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitBrawler.java @@ -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; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java index 32082a06a..83f8d1716 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitElementalist.java @@ -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; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java index bed396bf6..573a4bbe2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/quiver/kits/KitLeaper.java @@ -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)); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java index f06694328..9d036ec80 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitInfiltrator.java @@ -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; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java index 29fdccd6a..2cceaeb34 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitMarksman.java @@ -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; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java index 3a2e4a9e8..a85764e39 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/minigames/turfforts/kits/KitShredder.java @@ -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; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java index 03172d91d..97b94511b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/castlesiege/kits/KitHumanPeasant.java @@ -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; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java index 84dab0e96..b237f888b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitSurvivorRogue.java @@ -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, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java index b23a062d3..c8d9f298a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/standalone/zombiesurvival/kits/KitUndeadAlpha.java @@ -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)