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

Patched away the errors with ugly meassures.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-22 14:16:07 +02:00
parent 61e8730495
commit 390ad76fa6
7 changed files with 39 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/entity/Board.java
View File

@@ -98,7 +98,7 @@ public class Board extends Entity<Board> implements BoardInterface
public Faction getFactionAt(PS ps)
{
if (ps == null) return null;
return this.getTerritoryAccessAt(ps).getHostFaction();
return FactionColls.get().get(this).get(this.getTerritoryAccessAt(ps).getHostFactionId());
}
// SET

6
src/com/massivecraft/factions/entity/FPlayer.java
View File

@@ -153,13 +153,9 @@ public class FPlayer extends SenderEntity<FPlayer> implements EconomyParticipato
public FPlayer()
{
this.resetFactionData(false);
this.setFactionId(ConfServer.newPlayerStartingFactionID);
this.power = ConfServer.powerStarting;
this.lastPowerUpdateTime = System.currentTimeMillis();
if ( ! ConfServer.newPlayerStartingFactionID.equals(Const.FACTIONID_NONE) && FactionColl.get().containsId(ConfServer.newPlayerStartingFactionID))
{
this.factionId = ConfServer.newPlayerStartingFactionID;
}
}
public final void resetFactionData(boolean doSpoutUpdate)