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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

This commit is contained in:
Jonathan Williams 2014-08-09 07:41:09 -05:00
parent 9b75ef4f96 066dfbc9a9
commit 3ea2567079
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugins/Mineplex.Core/src/mineplex/core/gadget/types/MorphGadget.java
View File

@ -34,17 +34,6 @@ public abstract class MorphGadget extends Gadget
public void ApplyArmor(Player player) public void ApplyArmor(Player player)
{ {
Manager.RemoveArmor(player, _slot);
if (_slot == ArmorSlot.Helmet)
player.getInventory().setHelmet(ItemStackFactory.Instance.CreateStack(GetDisplayMaterial(), GetDisplayData(), 1, F.item(GetName())));
else if (_slot == ArmorSlot.Chest)
player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(GetDisplayMaterial(), GetDisplayData(), 1, F.item(GetName())));
else if (_slot == ArmorSlot.Legs)
player.getInventory().setLeggings(ItemStackFactory.Instance.CreateStack(GetDisplayMaterial(), GetDisplayData(), 1, F.item(GetName())));
else if (_slot == ArmorSlot.Boots)
player.getInventory().setBoots(ItemStackFactory.Instance.CreateStack(GetDisplayMaterial(), GetDisplayData(), 1, F.item(GetName())));
_active.add(player); _active.add(player);
UtilPlayer.message(player, F.main("Gadget", "You put on " + F.elem(GetName()) + ".")); UtilPlayer.message(player, F.main("Gadget", "You put on " + F.elem(GetName()) + "."));
@ -52,15 +41,6 @@ public abstract class MorphGadget extends Gadget
public void RemoveArmor(Player player) public void RemoveArmor(Player player)
{ {
if (_slot == ArmorSlot.Helmet)
player.getInventory().setHelmet(null);
else if (_slot == ArmorSlot.Chest)
player.getInventory().setChestplate(null);
else if (_slot == ArmorSlot.Legs)
player.getInventory().setLeggings(null);
else if (_slot == ArmorSlot.Boots)
player.getInventory().setBoots(null);
if (_active.remove(player)) if (_active.remove(player))
UtilPlayer.message(player, F.main("Gadget", "You took off " + F.elem(GetName()) + ".")); UtilPlayer.message(player, F.main("Gadget", "You took off " + F.elem(GetName()) + "."));
} }