From a91343334759c68d36ba3ba5377285ae73f1abaa Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Tue, 17 May 2016 11:43:48 +0200 Subject: [PATCH] MassiveCore - Mixin Stuff part 2 --- .../massivecraft/factions/cmd/CmdFactionsTerritorytitles.java | 3 ++- src/com/massivecraft/factions/engine/EngineMain.java | 1 + src/com/massivecraft/factions/entity/MPlayer.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java b/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java index ceebf546..c57cc225 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java @@ -7,6 +7,7 @@ import com.massivecraft.massivecore.command.requirement.RequirementHasPerm; import com.massivecraft.massivecore.command.requirement.RequirementTitlesAvailable; import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.mixin.MixinTitle; +import com.massivecraft.massivecore.nms.NmsChat; import com.massivecraft.massivecore.util.Txt; public class CmdFactionsTerritorytitles extends FactionsCommand @@ -36,7 +37,7 @@ public class CmdFactionsTerritorytitles extends FactionsCommand public Visibility getVisibility() { // We hide the command if titles aren't available. - if ( ! MixinTitle.get().isTitlesAvailable()) return Visibility.INVISIBLE; + if ( ! MixinTitle.get().isAvailable()) return Visibility.INVISIBLE; return super.getVisibility(); } diff --git a/src/com/massivecraft/factions/engine/EngineMain.java b/src/com/massivecraft/factions/engine/EngineMain.java index 3c0e9f35..8d7cb182 100644 --- a/src/com/massivecraft/factions/engine/EngineMain.java +++ b/src/com/massivecraft/factions/engine/EngineMain.java @@ -102,6 +102,7 @@ import com.massivecraft.massivecore.mixin.MixinMessage; import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.mixin.MixinWorld; import com.massivecraft.massivecore.money.Money; +import com.massivecraft.massivecore.nms.NmsChat; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.PlayerUtil; diff --git a/src/com/massivecraft/factions/entity/MPlayer.java b/src/com/massivecraft/factions/entity/MPlayer.java index 0a9b67ca..a31063b6 100644 --- a/src/com/massivecraft/factions/entity/MPlayer.java +++ b/src/com/massivecraft/factions/entity/MPlayer.java @@ -25,6 +25,7 @@ import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipC import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.massivecore.mixin.MixinSenderPs; import com.massivecraft.massivecore.mixin.MixinTitle; +import com.massivecraft.massivecore.nms.NmsChat; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSFormatHumanSpace; import com.massivecraft.massivecore.store.SenderEntity; @@ -576,7 +577,7 @@ public class MPlayer extends SenderEntity implements EconomyParticipato public boolean isTerritoryInfoTitles() { - if ( ! MixinTitle.get().isTitlesAvailable()) return false; + if ( ! MixinTitle.get().isAvailable()) return false; if (this.territoryInfoTitles == null) return MConf.get().territoryInfoTitlesDefault; return this.territoryInfoTitles; }