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

MCore use CommandSender above Player. Adhere to this standard.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-17 10:41:38 +02:00
parent 299316a915
commit 4449b56246
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/massivecraft/factions/FPerm.java
View File

@ -8,7 +8,6 @@ import java.util.Set;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player;
import com.massivecraft.factions.iface.RelationParticipator;
import com.massivecraft.mcore.ps.PS;
@ -185,7 +184,7 @@ public enum FPerm
if (informIfNot)
{
FPlayer notify = null;
if (testSubject instanceof Player)
if (testSubject instanceof CommandSender)
notify = FPlayerColl.get().get(testSubject);
else if (testSubject instanceof FPlayer)
notify = (FPlayer)testSubject;

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

@ -4,9 +4,7 @@ import com.massivecraft.factions.FPerm;
import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.cmd.arg.ARFPlayer;
import com.massivecraft.factions.cmd.req.ReqRoleIsAtLeast;
import com.massivecraft.mcore.cmd.req.ReqHasPerm;
public class CmdFactionsDeinvite extends FCommand

8
src/com/massivecraft/factions/event/FactionDisbandEvent.java
View File

@ -1,6 +1,6 @@
package com.massivecraft.factions.event;
import org.bukkit.entity.Player;
import org.bukkit.command.CommandSender;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
@ -30,7 +30,7 @@ public class FactionDisbandEvent extends Event implements Cancellable
// TODO: Could the fields be reorganized to achieve symmetry?
private String id;
private Player sender;
private CommandSender sender;
public Faction getFaction()
{
@ -42,7 +42,7 @@ public class FactionDisbandEvent extends Event implements Cancellable
return FPlayer.get(sender);
}
public Player getPlayer()
public CommandSender getPlayer()
{
return this.sender;
}
@ -51,7 +51,7 @@ public class FactionDisbandEvent extends Event implements Cancellable
// CONSTRUCT
// -------------------------------------------- //
public FactionDisbandEvent(Player sender, String factionId)
public FactionDisbandEvent(CommandSender sender, String factionId)
{
this.cancelled = false;
this.sender = sender;