Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MassiveCore - Mixin Stuff part 2

Browse Source
This commit is contained in:
Olof Larsson 2016-05-17 11:43:48 +02:00
parent 9c9681957c
commit a913433347
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/massivecraft/factions/cmd/CmdFactionsTerritorytitles.java
View File

@ -7,6 +7,7 @@ import com.massivecraft.massivecore.command.requirement.RequirementHasPerm;
import com.massivecraft.massivecore.command.requirement.RequirementTitlesAvailable; import com.massivecraft.massivecore.command.requirement.RequirementTitlesAvailable;
import com.massivecraft.massivecore.command.type.primitive.TypeBoolean; import com.massivecraft.massivecore.command.type.primitive.TypeBoolean;
import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.mixin.MixinTitle;
import com.massivecraft.massivecore.nms.NmsChat;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
public class CmdFactionsTerritorytitles extends FactionsCommand public class CmdFactionsTerritorytitles extends FactionsCommand
@ -36,7 +37,7 @@ public class CmdFactionsTerritorytitles extends FactionsCommand
public Visibility getVisibility() public Visibility getVisibility()
{ {
// We hide the command if titles aren't available. // 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(); return super.getVisibility();
} }

1
src/com/massivecraft/factions/engine/EngineMain.java
View File

@ -102,6 +102,7 @@ import com.massivecraft.massivecore.mixin.MixinMessage;
import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.mixin.MixinTitle;
import com.massivecraft.massivecore.mixin.MixinWorld; import com.massivecraft.massivecore.mixin.MixinWorld;
import com.massivecraft.massivecore.money.Money; import com.massivecraft.massivecore.money.Money;
import com.massivecraft.massivecore.nms.NmsChat;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.MUtil;
import com.massivecraft.massivecore.util.PlayerUtil; import com.massivecraft.massivecore.util.PlayerUtil;

3
src/com/massivecraft/factions/entity/MPlayer.java
View File

@ -25,6 +25,7 @@ import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipC
import com.massivecraft.factions.util.RelationUtil; import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.massivecore.mixin.MixinSenderPs; import com.massivecraft.massivecore.mixin.MixinSenderPs;
import com.massivecraft.massivecore.mixin.MixinTitle; import com.massivecraft.massivecore.mixin.MixinTitle;
import com.massivecraft.massivecore.nms.NmsChat;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.ps.PSFormatHumanSpace; import com.massivecraft.massivecore.ps.PSFormatHumanSpace;
import com.massivecraft.massivecore.store.SenderEntity; import com.massivecraft.massivecore.store.SenderEntity;
@ -576,7 +577,7 @@ public class MPlayer extends SenderEntity<MPlayer> implements EconomyParticipato
public boolean isTerritoryInfoTitles() public boolean isTerritoryInfoTitles()
{ {
if ( ! MixinTitle.get().isTitlesAvailable()) return false; if ( ! MixinTitle.get().isAvailable()) return false;
if (this.territoryInfoTitles == null) return MConf.get().territoryInfoTitlesDefault; if (this.territoryInfoTitles == null) return MConf.get().territoryInfoTitlesDefault;
return this.territoryInfoTitles; return this.territoryInfoTitles;
} }