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

Allow Flags to interact with costumes and hats correctly

Browse Source
This commit is contained in:
Graphica 2017-06-28 01:36:21 -04:00 committed by cnr
parent e04d467830
commit 4cc1068055
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java
View File

@ -47,7 +47,7 @@ public abstract class HatGadget extends OutfitGadget
public void applyArmor(Player player, boolean message) public void applyArmor(Player player, boolean message)
{ {
Manager.removeGadgetType(player, GadgetType.MORPH, this); Manager.removeGadgetType(player, GadgetType.MORPH, this);
Manager.removeGadgetType(player, GadgetType.FLAG, this);
Manager.removeOutfit(player, _slot); Manager.removeOutfit(player, _slot);
_active.add(player); _active.add(player);

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

@ -26,7 +26,8 @@ public abstract class MorphGadget extends Gadget
public void applyArmor(Player player, boolean message) public void applyArmor(Player player, boolean message)
{ {
Manager.removeGadgetType(player, GadgetType.MORPH, this); Manager.removeGadgetType(player, GadgetType.MORPH, this);
Manager.removeGadgetType(player, GadgetType.COSTUME); Manager.removeGadgetType(player, GadgetType.COSTUME, this);
Manager.removeGadgetType(player, GadgetType.FLAG, this);
_active.add(player); _active.add(player);

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/types/OutfitGadget.java
View File

@ -60,7 +60,7 @@ public abstract class OutfitGadget extends Gadget
public void applyArmor(Player player, boolean message) public void applyArmor(Player player, boolean message)
{ {
Manager.removeGadgetType(player, GadgetType.MORPH, this); Manager.removeGadgetType(player, GadgetType.MORPH, this);
Manager.removeGadgetType(player, GadgetType.FLAG, this);
Manager.removeOutfit(player, _slot); Manager.removeOutfit(player, _slot);
_active.add(player); _active.add(player);