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

Fix migrator bug

Browse Source
This commit is contained in:
Magnus Ulf 2019-01-19 15:11:18 +01:00
parent 5d09b5d05f
commit 6b14bb0b56
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/massivecraft/factions/entity/migrator/MigratorMPlayer001Ranks.java
View File

@ -1,8 +1,11 @@
package com.massivecraft.factions.entity.migrator; package com.massivecraft.factions.entity.migrator;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive; import com.google.gson.JsonPrimitive;
import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.factions.entity.MConf;
import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.MPlayer;
import com.massivecraft.factions.entity.Rank; import com.massivecraft.factions.entity.Rank;
import com.massivecraft.massivecore.store.migrator.MigratorRoot; import com.massivecraft.massivecore.store.migrator.MigratorRoot;
@ -29,18 +32,45 @@ public class MigratorMPlayer001Ranks extends MigratorRoot
@Override @Override
public void migrateInner(JsonObject entity) public void migrateInner(JsonObject entity)
{ {
String role = entity.remove("role").getAsString(); // Get role
String factionId = entity.get("factionId").getAsString(); JsonElement jsonRole = entity.remove("role");
Faction faction = Faction.get(factionId); String role;
if (jsonRole == null)
Collection<Rank> ranks = faction.getRanks().getAll();
for (Rank rank : ranks)
{ {
if (!rank.getName().equalsIgnoreCase(role)) continue; // The role can be null.
// Then they are probably recruit in the default faction (Wilderness).
role = null;
}
else
{
role = jsonRole.getAsString();
}
entity.add("rankId", new JsonPrimitive(rank.getId())); // Get faction
JsonElement jsonFaction = entity.get("factionId");
String factionId;
if (jsonFaction == null) factionId = MConf.get().defaultPlayerFactionId;
else factionId = jsonFaction.getAsString();
Faction faction = FactionColl.get().get(factionId);
if (faction == null) faction = FactionColl.get().getNone();
// Get rank
Rank rank = null;
if (role != null)
{
Collection<Rank> ranks = faction.getRanks().getAll();
for (Rank r : ranks)
{
if (!r.getName().equalsIgnoreCase(role)) continue;
rank = r;
break; break;
} }
} }
if (rank == null) rank = faction.getLowestRank();
entity.add("rankId", new JsonPrimitive(rank.getId()));
}
} }