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

fix FactionsEventChunkChange bug, tryClaim changes the board in between the time it instantiates this event and it calls getType

Browse Source
This commit is contained in:
ÆtherSurfer 2013-07-20 19:29:21 -04:00
parent 6f1777cc83
commit bbc77790da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@ public class FactionsEventChunkChange extends FactionsEventAbstractSender
private final PS chunk; private final PS chunk;
public PS getChunk() { return this.chunk; } public PS getChunk() { return this.chunk; }
private final Faction currentFaction;
private final Faction newFaction; private final Faction newFaction;
public Faction getNewFaction() { return this.newFaction; } public Faction getNewFaction() { return this.newFaction; }
@ -36,6 +37,7 @@ public class FactionsEventChunkChange extends FactionsEventAbstractSender
{ {
super(sender); super(sender);
this.chunk = chunk.getChunk(true); this.chunk = chunk.getChunk(true);
this.currentFaction = BoardColls.get().getFactionAt(chunk);
this.newFaction = newFaction; this.newFaction = newFaction;
} }
@ -45,8 +47,6 @@ public class FactionsEventChunkChange extends FactionsEventAbstractSender
public FactionsEventChunkChangeType getType() public FactionsEventChunkChangeType getType()
{ {
Faction currentFaction = BoardColls.get().getFactionAt(chunk);
if (currentFaction.isNone()) return FactionsEventChunkChangeType.BUY; if (currentFaction.isNone()) return FactionsEventChunkChangeType.BUY;
if (newFaction.isNormal()) return FactionsEventChunkChangeType.CONQUER; if (newFaction.isNormal()) return FactionsEventChunkChangeType.CONQUER;