Panic fix to remove infinite loop
This commit is contained in:
parent
7575cfcafc
commit
c248d419bb
@ -132,10 +132,15 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
|
|||||||
}
|
}
|
||||||
|
|
||||||
public final void resetFactionData(boolean doSpotUpdate)
|
public final void resetFactionData(boolean doSpotUpdate)
|
||||||
|
{
|
||||||
|
if (this.factionId != null && Factions.i.exists(this.factionId)) // Avoid infinite loop! TODO: I think that this is needed is a sign we need to refactor.
|
||||||
{
|
{
|
||||||
Faction currentFaction = this.getFaction();
|
Faction currentFaction = this.getFaction();
|
||||||
if (currentFaction != null)
|
if (currentFaction != null)
|
||||||
|
{
|
||||||
currentFaction.removeFPlayer(this);
|
currentFaction.removeFPlayer(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.factionId = "0"; // The default neutral faction
|
this.factionId = "0"; // The default neutral faction
|
||||||
this.chatMode = ChatMode.PUBLIC;
|
this.chatMode = ChatMode.PUBLIC;
|
||||||
|
Loading…
Reference in New Issue
Block a user