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

Fix NPE when not overriding.

Browse Source
This commit is contained in:
ulumulu1510 2017-04-06 22:32:52 +02:00
parent 2c58aed1ba
commit 19a1d7fab4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java
View File

@ -1,16 +1,18 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import java.util.List;
import org.bukkit.Bukkit;
import com.massivecraft.factions.Factions; import com.massivecraft.factions.Factions;
import com.massivecraft.factions.entity.MFlag; import com.massivecraft.factions.entity.MFlag;
import com.massivecraft.factions.entity.MFlagColl; import com.massivecraft.factions.entity.MFlagColl;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.MassiveException;
import com.massivecraft.massivecore.command.Parameter; import com.massivecraft.massivecore.command.Parameter;
import com.massivecraft.massivecore.pager.Pager; import com.massivecraft.massivecore.pager.Pager;
import com.massivecraft.massivecore.pager.Stringifier; import com.massivecraft.massivecore.pager.Stringifier;
import com.massivecraft.massivecore.predicate.Predicate; import com.massivecraft.massivecore.predicate.Predicate;
import org.bukkit.Bukkit;
import java.util.List;
public class CmdFactionsFlagList extends FactionsCommand public class CmdFactionsFlagList extends FactionsCommand
{ {
@ -33,9 +35,10 @@ public class CmdFactionsFlagList extends FactionsCommand
{ {
// Parameter // Parameter
final int page = this.readArg(); final int page = this.readArg();
final MPlayer mplayer = msender;
// Pager create // Pager create
String title = "Flag List for " + msenderFaction.describeTo(msender); String title = "Flag List for " + msenderFaction.describeTo(mplayer);
final Pager<MFlag> pager = new Pager<>(this, title, page, new Stringifier<MFlag>() final Pager<MFlag> pager = new Pager<>(this, title, page, new Stringifier<MFlag>()
{ {
@Override @Override
@ -51,7 +54,7 @@ public class CmdFactionsFlagList extends FactionsCommand
public void run() public void run()
{ {
// Get items // Get items
List<MFlag> items = MFlagColl.get().getAll(msender.isOverriding() ? null : new Predicate<MFlag>() List<MFlag> items = MFlagColl.get().getAll(mplayer.isOverriding() ? null : new Predicate<MFlag>()
{ {
@Override @Override
public boolean apply(MFlag mflag) public boolean apply(MFlag mflag)