EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Starting to rename fplayer --> uplayer since we will need an mplayer.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 17:59:51 +02:00
parent e30c652759
commit 19f9834210
67 changed files with 407 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/factions/event/FactionsEventAbstractSender.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.mcore.event.MCoreEvent;
public abstract class FactionsEventAbstractSender extends MCoreEvent
@ -13,7 +13,7 @@ public abstract class FactionsEventAbstractSender extends MCoreEvent
private final CommandSender sender;
public CommandSender getSender() { return this.sender; }
public FPlayer getFSender() { return FPlayer.get(this.sender); }
public UPlayer getFSender() { return UPlayer.get(this.sender); }
// -------------------------------------------- //
// CONSTRUCT

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

@ -3,7 +3,7 @@ package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.Faction;
public class FactionsEventInvitedChange extends FactionsEventAbstractSender
@ -20,8 +20,8 @@ public class FactionsEventInvitedChange extends FactionsEventAbstractSender
// FIELDS
// -------------------------------------------- //
private final FPlayer fplayer;
public FPlayer getFPlayer() { return this.fplayer; }
private final UPlayer fplayer;
public UPlayer getFPlayer() { return this.fplayer; }
private final Faction faction;
public Faction getFaction() { return this.faction; }
@ -34,7 +34,7 @@ public class FactionsEventInvitedChange extends FactionsEventAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public FactionsEventInvitedChange(CommandSender sender, FPlayer fplayer, Faction faction, boolean newInvited)
public FactionsEventInvitedChange(CommandSender sender, UPlayer fplayer, Faction faction, boolean newInvited)
{
super(sender);
this.fplayer = fplayer;

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

@ -3,7 +3,7 @@ package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.Faction;
public class FactionsEventMembershipChange extends FactionsEventAbstractSender
@ -27,8 +27,8 @@ public class FactionsEventMembershipChange extends FactionsEventAbstractSender
super.setCancelled(cancelled);
}
private final FPlayer fplayer;
public FPlayer getFPlayer() { return this.fplayer; }
private final UPlayer fplayer;
public UPlayer getFPlayer() { return this.fplayer; }
private final Faction newFaction;
public Faction getNewFaction() { return this.newFaction; }
@ -40,7 +40,7 @@ public class FactionsEventMembershipChange extends FactionsEventAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public FactionsEventMembershipChange(CommandSender sender, FPlayer fplayer, Faction newFaction, MembershipChangeReason reason)
public FactionsEventMembershipChange(CommandSender sender, UPlayer fplayer, Faction newFaction, MembershipChangeReason reason)
{
super(sender);
this.fplayer = fplayer;

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

@ -3,7 +3,7 @@ package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.UPlayer;
public class FactionsEventPowerChange extends FactionsEventAbstractSender
{
@ -19,8 +19,8 @@ public class FactionsEventPowerChange extends FactionsEventAbstractSender
// FIELDS
// -------------------------------------------- //
private final FPlayer fplayer;
public FPlayer getFPlayer() { return this.fplayer; }
private final UPlayer fplayer;
public UPlayer getFPlayer() { return this.fplayer; }
private final PowerChangeReason reason;
public PowerChangeReason getReason() { return this.reason; }
@ -33,7 +33,7 @@ public class FactionsEventPowerChange extends FactionsEventAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public FactionsEventPowerChange(CommandSender sender, FPlayer fplayer, PowerChangeReason reason, double newPower)
public FactionsEventPowerChange(CommandSender sender, UPlayer fplayer, PowerChangeReason reason, double newPower)
{
super(sender);
this.fplayer = fplayer;

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

@ -3,7 +3,7 @@ package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.entity.FPlayer;
import com.massivecraft.factions.entity.UPlayer;
public class FactionsEventTitleChange extends FactionsEventAbstractSender
{
@ -19,8 +19,8 @@ public class FactionsEventTitleChange extends FactionsEventAbstractSender
// FIELDS
// -------------------------------------------- //
private final FPlayer fplayer;
public FPlayer getFPlayer() { return this.fplayer; }
private final UPlayer fplayer;
public UPlayer getFPlayer() { return this.fplayer; }
private String newTitle;
public String getNewTitle() { return this.newTitle; }
@ -30,7 +30,7 @@ public class FactionsEventTitleChange extends FactionsEventAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public FactionsEventTitleChange(CommandSender sender, FPlayer fplayer, String newTitle)
public FactionsEventTitleChange(CommandSender sender, UPlayer fplayer, String newTitle)
{
super(sender);
this.fplayer = fplayer;