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

MCore changes

Browse Source
This commit is contained in:
Olof Larsson
2013-05-03 09:58:43 +02:00
parent cf03bd5b8a
commit 7c10a6c83f
9 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/entity/BoardColls.java
View File

@ -12,9 +12,9 @@ import com.massivecraft.factions.Const;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.RelationParticipator;
import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.ps.PS;
import com.massivecraft.mcore.ps.PSBuilder;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.util.DiscUtil;
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;

13
src/com/massivecraft/factions/entity/Faction.java
View File

@ -22,7 +22,6 @@ import com.massivecraft.mcore.ps.PS;
import com.massivecraft.mcore.store.Entity;
import com.massivecraft.mcore.util.MUtil;
import com.massivecraft.mcore.util.SenderUtil;
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;
public class Faction extends Entity<Faction> implements EconomyParticipator
@ -661,8 +660,8 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
}
}
System.out.println("setPerms target:");
System.out.println(Factions.get().gson.toJson(target, new TypeToken<Map<FPerm, Set<Rel>>>(){}.getType()));
//System.out.println("setPerms target:");
//System.out.println(Factions.get().gson.toJson(target, new TypeToken<Map<FPerm, Set<Rel>>>(){}.getType()));
// Detect Nochange
if (MUtil.equals(this.perms, target)) return;
@ -699,8 +698,8 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
{
Map<FPerm, Set<Rel>> perms = this.getPerms();
System.out.println("setRelationPermitted before:");
System.out.println(Factions.get().gson.toJson(perms, new TypeToken<Map<FPerm, Set<Rel>>>(){}.getType()));
//System.out.println("setRelationPermitted before:");
//System.out.println(Factions.get().gson.toJson(perms, new TypeToken<Map<FPerm, Set<Rel>>>(){}.getType()));
Set<Rel> rels = perms.get(perm);
@ -713,8 +712,8 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
rels.remove(rel);
}
System.out.println("setRelationPermitted after:");
System.out.println(Factions.get().gson.toJson(perms, new TypeToken<Map<FPerm, Set<Rel>>>(){}.getType()));
//System.out.println("setRelationPermitted after:");
//System.out.println(Factions.get().gson.toJson(perms, new TypeToken<Map<FPerm, Set<Rel>>>(){}.getType()));
this.setPerms(perms);
}

2
src/com/massivecraft/factions/entity/FactionColls.java
View File

@ -8,8 +8,8 @@ import java.util.Set;
import com.massivecraft.factions.Const;
import com.massivecraft.factions.Factions;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.util.DiscUtil;
import com.massivecraft.mcore.util.MUtil;
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;

2
src/com/massivecraft/factions/entity/UConfColls.java
View File

@ -2,8 +2,8 @@ package com.massivecraft.factions.entity;
import com.massivecraft.factions.Const;
import com.massivecraft.factions.Factions;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.usys.Aspect;
public class UConfColls extends XColls<UConfColl, UConf>
{

2
src/com/massivecraft/factions/entity/UPlayerColls.java
View File

@ -7,8 +7,8 @@ import java.util.Map.Entry;
import com.massivecraft.factions.Const;
import com.massivecraft.factions.Factions;
import com.massivecraft.mcore.Aspect;
import com.massivecraft.mcore.MCore;
import com.massivecraft.mcore.usys.Aspect;
import com.massivecraft.mcore.util.DiscUtil;
import com.massivecraft.mcore.xlib.gson.reflect.TypeToken;