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

Step 1 in many removing the universe system. Untested and lacking auto convert features.

Browse Source
This commit is contained in:
Olof Larsson
2014-09-17 13:17:33 +02:00
parent c0b7b783b2
commit 529ae45ede
99 changed files with 1789 additions and 2662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/massivecraft/factions/event/EventFactionsAbstractSender.java
View File

@ -2,7 +2,7 @@ package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.event.EventMassiveCore;
public abstract class EventFactionsAbstractSender extends EventMassiveCore
@ -13,7 +13,7 @@ public abstract class EventFactionsAbstractSender extends EventMassiveCore
private final CommandSender sender;
public CommandSender getSender() { return this.sender; }
public UPlayer getUSender() { return this.sender == null ? null : UPlayer.get(this.sender); }
public MPlayer getUSender() { return this.sender == null ? null : MPlayer.get(this.sender); }
// -------------------------------------------- //
// CONSTRUCT

8
src/main/java/com/massivecraft/factions/event/EventFactionsChunkChange.java
View File

@ -3,9 +3,9 @@ package com.massivecraft.factions.event;
import org.bukkit.command.CommandSender;
import org.bukkit.event.HandlerList;
import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.massivecore.ps.PS;
public class EventFactionsChunkChange extends EventFactionsAbstractSender
@ -37,7 +37,7 @@ public class EventFactionsChunkChange extends EventFactionsAbstractSender
{
super(sender);
this.chunk = chunk.getChunk(true);
this.currentFaction = BoardColls.get().getFactionAt(chunk);
this.currentFaction = BoardColl.get().getFactionAt(chunk);
this.newFaction = newFaction;
}
@ -50,7 +50,7 @@ public class EventFactionsChunkChange extends EventFactionsAbstractSender
if (currentFaction.isNone()) return EventFactionsChunkChangeType.BUY;
if (newFaction.isNormal()) return EventFactionsChunkChangeType.CONQUER;
UPlayer usender = this.getUSender();
MPlayer usender = this.getUSender();
if (usender != null && usender.getFaction() == currentFaction) return EventFactionsChunkChangeType.SELL;
return EventFactionsChunkChangeType.PILLAGE;

6
src/main/java/com/massivecraft/factions/event/EventFactionsCreate.java
View File

@ -17,9 +17,6 @@ public class EventFactionsCreate extends EventFactionsAbstractSender
// FIELDS
// -------------------------------------------- //
private final String universe;
public final String getUniverse() { return this.universe; }
private final String factionId;
public final String getFactionId() { return this.factionId; }
@ -30,10 +27,9 @@ public class EventFactionsCreate extends EventFactionsAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public EventFactionsCreate(CommandSender sender, String universe, String factionId, String factionName)
public EventFactionsCreate(CommandSender sender, String factionId, String factionName)
{
super(sender);
this.universe = universe;
this.factionId = factionId;
this.factionName = factionName;
}

8
src/main/java/com/massivecraft/factions/event/EventFactionsInvitedChange.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.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
public class EventFactionsInvitedChange extends EventFactionsAbstractSender
@ -20,8 +20,8 @@ public class EventFactionsInvitedChange extends EventFactionsAbstractSender
// FIELDS
// -------------------------------------------- //
private final UPlayer uplayer;
public UPlayer getUPlayer() { return this.uplayer; }
private final MPlayer uplayer;
public MPlayer getUPlayer() { return this.uplayer; }
private final Faction faction;
public Faction getFaction() { return this.faction; }
@ -34,7 +34,7 @@ public class EventFactionsInvitedChange extends EventFactionsAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public EventFactionsInvitedChange(CommandSender sender, UPlayer uplayer, Faction faction, boolean newInvited)
public EventFactionsInvitedChange(CommandSender sender, MPlayer uplayer, Faction faction, boolean newInvited)
{
super(sender);
this.uplayer = uplayer;

8
src/main/java/com/massivecraft/factions/event/EventFactionsMembershipChange.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.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Faction;
public class EventFactionsMembershipChange extends EventFactionsAbstractSender
@ -27,8 +27,8 @@ public class EventFactionsMembershipChange extends EventFactionsAbstractSender
super.setCancelled(cancelled);
}
private final UPlayer uplayer;
public UPlayer getUPlayer() { return this.uplayer; }
private final MPlayer uplayer;
public MPlayer getUPlayer() { return this.uplayer; }
private final Faction newFaction;
public Faction getNewFaction() { return this.newFaction; }
@ -40,7 +40,7 @@ public class EventFactionsMembershipChange extends EventFactionsAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public EventFactionsMembershipChange(CommandSender sender, UPlayer uplayer, Faction newFaction, MembershipChangeReason reason)
public EventFactionsMembershipChange(CommandSender sender, MPlayer uplayer, Faction newFaction, MembershipChangeReason reason)
{
super(sender);
this.uplayer = uplayer;

8
src/main/java/com/massivecraft/factions/event/EventFactionsPowerChange.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.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
public class EventFactionsPowerChange extends EventFactionsAbstractSender
{
@ -19,8 +19,8 @@ public class EventFactionsPowerChange extends EventFactionsAbstractSender
// FIELDS
// -------------------------------------------- //
private final UPlayer uplayer;
public UPlayer getUPlayer() { return this.uplayer; }
private final MPlayer uplayer;
public MPlayer getUPlayer() { return this.uplayer; }
private final PowerChangeReason reason;
public PowerChangeReason getReason() { return this.reason; }
@ -33,7 +33,7 @@ public class EventFactionsPowerChange extends EventFactionsAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public EventFactionsPowerChange(CommandSender sender, UPlayer uplayer, PowerChangeReason reason, double newPower)
public EventFactionsPowerChange(CommandSender sender, MPlayer uplayer, PowerChangeReason reason, double newPower)
{
super(sender);
this.uplayer = uplayer;

6
src/main/java/com/massivecraft/factions/event/EventFactionsPvpDisallowed.java
View File

@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import com.massivecraft.factions.entity.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
/**
* This event is fired when PVP is disallowed between players due to any rules in Factions.
@ -29,11 +29,11 @@ public class EventFactionsPvpDisallowed extends EventFactionsAbstract
private final Player attacker;
public Player getAttacker() { return this.attacker; }
public UPlayer getUAttacker() { return this.attacker == null ? null : UPlayer.get(this.attacker); }
public MPlayer getUAttacker() { return this.attacker == null ? null : MPlayer.get(this.attacker); }
private final Player defender;
public Player getDefender() { return this.defender; }
public UPlayer getUDefender() { return this.defender == null ? null : UPlayer.get(this.defender); }
public MPlayer getUDefender() { return this.defender == null ? null : MPlayer.get(this.defender); }
private final EntityDamageByEntityEvent event;
public EntityDamageByEntityEvent getEvent() { return this.event; }

8
src/main/java/com/massivecraft/factions/event/EventFactionsTitleChange.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.UPlayer;
import com.massivecraft.factions.entity.MPlayer;
public class EventFactionsTitleChange extends EventFactionsAbstractSender
{
@ -19,8 +19,8 @@ public class EventFactionsTitleChange extends EventFactionsAbstractSender
// FIELDS
// -------------------------------------------- //
private final UPlayer uplayer;
public UPlayer getUPlayer() { return this.uplayer; }
private final MPlayer uplayer;
public MPlayer getUPlayer() { return this.uplayer; }
private String newTitle;
public String getNewTitle() { return this.newTitle; }
@ -30,7 +30,7 @@ public class EventFactionsTitleChange extends EventFactionsAbstractSender
// CONSTRUCT
// -------------------------------------------- //
public EventFactionsTitleChange(CommandSender sender, UPlayer uplayer, String newTitle)
public EventFactionsTitleChange(CommandSender sender, MPlayer uplayer, String newTitle)
{
super(sender);
this.uplayer = uplayer;