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

Change order in UPlayer.detachId to avoid NPE.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-25 10:27:39 +02:00
parent 09a23353a7
commit 0ed104279f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/massivecraft/factions/entity/UPlayerColl.java
View File

@ -42,16 +42,19 @@ public class UPlayerColl extends SenderColl<UPlayer>
@Override
public UPlayer detachId(Object oid)
{
UPlayer ret = super.detachId(oid);
UPlayer ret = this.get(oid);
if (ret == null) return null;
// If inited ...
if (!this.inited()) return ret;
// ... update the index.
Faction faction = ret.getFaction();
faction.uplayers.remove(ret);
if (this.inited())
{
// ... update the index.
Faction faction = ret.getFaction();
faction.uplayers.remove(ret);
}
super.detachId(oid);
return ret;
}