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

We might have the special faction id but not the faction on update. Probably Fixes #722.

Browse Source
This commit is contained in:
Olof Larsson 2014-12-05 00:34:48 +01:00
parent 5c9c2a6123
commit 442bbd1139
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/massivecraft/factions/update/UpdateUtil.java
View File

@ -159,16 +159,17 @@ public class UpdateUtil
// Get the coll. // Get the coll.
FactionColl coll = FactionColl.get(); FactionColl coll = FactionColl.get();
// Get the faction and detach it
Faction faction = coll.detachId(from);
if (faction == null) return;
coll.syncId(from);
// A faction may already be occupying the to-id. // A faction may already be occupying the to-id.
// We must remove it to make space for renaming. // We must remove it to make space for renaming.
// This faction is simply an auto-created faction with no references yet. // This faction is simply an auto-created faction with no references yet.
coll.detachId(to); coll.detachId(to);
coll.syncId(to); coll.syncId(to);
// Get the faction and detach it
Faction faction = coll.detachId(from);
coll.syncId(from);
// Attach it // Attach it
coll.attach(faction, to); coll.attach(faction, to);
coll.syncId(to); coll.syncId(to);