mirror of
https://github.com/MassiveCraft/Factions.git
synced 2024-08-31 08:49:35 +02:00
Merge branch 'master' of github.com:MassiveCraft/Factions
This commit is contained in:
commit
f0eae47164
|
@ -140,9 +140,14 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
|
|||
|
||||
public final void resetFactionData(boolean doSpotUpdate)
|
||||
{
|
||||
Faction currentFaction = this.getFaction();
|
||||
if (currentFaction != null)
|
||||
currentFaction.removeFPlayer(this);
|
||||
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();
|
||||
if (currentFaction != null)
|
||||
{
|
||||
currentFaction.removeFPlayer(this);
|
||||
}
|
||||
}
|
||||
|
||||
this.factionId = "0"; // The default neutral faction
|
||||
this.chatMode = ChatMode.PUBLIC;
|
||||
|
|
|
@ -288,7 +288,7 @@ public class FactionsPlayerListener implements Listener
|
|||
|
||||
me.getPower(); // update power, so they won't have gained any while dead
|
||||
|
||||
Location home = me.getFaction().getHome();
|
||||
Location home = me.getFaction().getHome(); // TODO: WARNING FOR NPE HERE THE ORIO FOR RESPAWN SHOULD BE ASSIGNABLE FROM CONFIG.
|
||||
if
|
||||
(
|
||||
Conf.homesEnabled
|
||||
|
|
Loading…
Reference in New Issue
Block a user