Merge pull request #24 from c0508383/master

Fixed a faction duplication glitch

src/main/java/noppes/npcs/PacketHandlerServer.java

@@ -560,7 +560,7 @@ public class PacketHandlerServer{
 		else if(type == EnumPacketServer.FactionSave){
 			Faction faction = new Faction();
 			faction.readNBT(Server.readNBT(buffer));
-			FactionController.getInstance().create(faction);
+			FactionController.getInstance().saveFaction(faction);
 			NoppesUtilServer.sendFactionDataAll(player);
 			NBTTagCompound compound = new NBTTagCompound();
 			faction.writeNBT(compound);

src/main/java/noppes/npcs/controllers/FactionController.java

@@ -139,7 +139,7 @@ public class FactionController implements IFactionHandler {
 	}
 
 	public void saveFaction(Faction faction) {
-		
+
 		if(faction.id < 0){
 			faction.id = getUnusedId();
 			while(hasName(faction.name))
@@ -157,23 +157,12 @@ public class FactionController implements IFactionHandler {
 	}
 
 	public Faction create(Faction faction) {
-		String name = faction.getName();
-		int color = faction.getColor();
-
-		for(faction = new Faction(); this.hasName(name); name = name + "_") {
-		}
-
-		faction.name = name;
-		faction.color = color;
 		this.saveFaction(faction);
 		return faction;
 	}
 
 	public Faction create(String name, int color) {
-		Faction faction;
-		for(faction = new Faction(); this.hasName(name); name = name + "_") {
-		}
-
+		Faction faction = new Faction();
 		faction.name = name;
 		faction.color = color;
 		this.saveFaction(faction);