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

Further code cleanup

Browse Source
This commit is contained in:
Magnus Ulf
2019-05-06 11:08:28 +02:00
parent 51135db452
commit a6af3c69c8
11 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/cmd/CmdFactionsAccessInspect.java
View File

@@ -47,7 +47,7 @@ public class CmdFactionsAccessInspect extends FactionsCommand
String factionId = faction.getId();
// Check if they have access perms, unless they are checking for their own access
if (mpermable != msender && mpermable != msenderFaction && mpermable != msender.getRank());
if (mpermable != msender && mpermable != msenderFaction && mpermable != msender.getRank())
{
if ( ! MPerm.getPermAccess().has(msender, faction, true)) return;
}

1
src/com/massivecraft/factions/cmd/CmdFactionsStatus.java
View File

@@ -13,7 +13,6 @@ import com.massivecraft.massivecore.util.TimeDiffUtil;
import com.massivecraft.massivecore.util.TimeUnit;
import com.massivecraft.massivecore.util.Txt;
import java.util.Collections;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;

4
src/com/massivecraft/factions/cmd/type/TypeFactionNameAbstract.java
View File

@@ -1,6 +1,5 @@
package com.massivecraft.factions.cmd.type;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPlayer;
@@ -28,8 +27,7 @@ public class TypeFactionNameAbstract extends TypeNameAbstract
public Named getCurrent(CommandSender sender)
{
MPlayer mplayer = MPlayer.get(sender);
Faction faction = mplayer.getFaction();
return faction;
return mplayer.getFaction();
}
@Override

1
src/com/massivecraft/factions/cmd/type/TypeMPermable.java
View File

@@ -1,6 +1,5 @@
package com.massivecraft.factions.cmd.type;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MPerm;