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

Change kit helmet to skull.

This commit is contained in:
Thanos paravantis 2016-01-01 15:35:45 +02:00
parent bd63ff84e7
commit e89785963a
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.recommenders/caches/identified-project-coordinates.json
View File

@ -1 +1 @@
[[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Mineplex.Core","type":"PROJECT","hints":{"PROJECT_NAME":"Mineplex.Core"}},"ABSENT"],[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Nautilus.Game.Arcade","type":"PROJECT","hints":{"PROJECT_NAME":"Nautilus.Game.Arcade"}},"ABSENT"],[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Libraries\\craftbukkit.jar","type":"JAR","hints":{}},"ABSENT"]] [[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Libraries\\craftbukkit.jar","type":"JAR","hints":{}},"ABSENT"],[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Mineplex.Core.Common","type":"PROJECT","hints":{"PROJECT_NAME":"Mineplex.Core.Common"}},"ABSENT"]]

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/DeathEffect.java
View File

@ -119,6 +119,7 @@ public class DeathEffect
}.runTaskLater(_plugin, 60L); }.runTaskLater(_plugin, 60L);
} }
@SuppressWarnings("deprecation")
private void spawnChickenHead(DeathEffectData data) private void spawnChickenHead(DeathEffectData data)
{ {
Location loc = data.getLocation(); Location loc = data.getLocation();

22
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/kit/KitBawksFood.java
View File

@ -8,7 +8,9 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.EntityEquipment;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.LeatherArmorMeta;
import org.bukkit.inventory.meta.SkullMeta;
import mineplex.core.common.util.UtilSkull;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability; import nautilus.game.arcade.kit.KitAvailability;
@ -24,7 +26,7 @@ public class KitBawksFood extends Kit
new String[] { "You must listen to Bawk Bawk." }, new String[] { "You must listen to Bawk Bawk." },
new Perk[] { }, new Perk[] { },
EntityType.SKELETON, EntityType.SKELETON,
new ItemStack(Material.COOKED_CHICKEN) new ItemStack(Material.AIR)
); );
} }
@ -34,16 +36,22 @@ public class KitBawksFood extends Kit
// Items may be added manually when a challenge starts. // Items may be added manually when a challenge starts.
} }
@SuppressWarnings("deprecation")
@Override @Override
public void SpawnCustom(LivingEntity ent) public void SpawnCustom(LivingEntity ent)
{ {
EntityEquipment equipment = ent.getEquipment(); EntityEquipment equipment = ent.getEquipment();
ItemStack helmet = new ItemStack(Material.LEATHER_HELMET); ItemStack skull = new ItemStack(Material.SKULL_ITEM, 1, (short) 0, (byte) 3);
LeatherArmorMeta helmetMeta = (LeatherArmorMeta) helmet.getItemMeta(); SkullMeta meta = (SkullMeta) skull.getItemMeta();
helmetMeta.setColor(Color.WHITE); meta.setOwner(UtilSkull.getPlayerHeadName(EntityType.CHICKEN));
helmetMeta.spigot().setUnbreakable(true); skull.setItemMeta(meta);
helmet.setItemMeta(helmetMeta);
// ItemStack helmet = new ItemStack(Material.LEATHER_HELMET);
// LeatherArmorMeta helmetMeta = (LeatherArmorMeta) helmet.getItemMeta();
// helmetMeta.setColor(Color.WHITE);
// helmetMeta.spigot().setUnbreakable(true);
// helmet.setItemMeta(helmetMeta);
ItemStack chestplate = new ItemStack(Material.LEATHER_CHESTPLATE); ItemStack chestplate = new ItemStack(Material.LEATHER_CHESTPLATE);
LeatherArmorMeta chestplateMeta = (LeatherArmorMeta) chestplate.getItemMeta(); LeatherArmorMeta chestplateMeta = (LeatherArmorMeta) chestplate.getItemMeta();
@ -63,7 +71,7 @@ public class KitBawksFood extends Kit
bootsMeta.spigot().setUnbreakable(true); bootsMeta.spigot().setUnbreakable(true);
boots.setItemMeta(bootsMeta); boots.setItemMeta(bootsMeta);
equipment.setHelmet(helmet); equipment.setHelmet(skull);
equipment.setChestplate(chestplate); equipment.setChestplate(chestplate);
equipment.setLeggings(leggings); equipment.setLeggings(leggings);
equipment.setBoots(boots); equipment.setBoots(boots);