Merge branch 'master' into GUI

# Conflicts:
#	UserInfo.java

UserInfo.java

@@ -1,28 +1,37 @@
 package org.poopki.duckdns.user_db;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 public class UserInfo extends Status {
     private UUID m_UUID;
     private String m_Name;
 
-    private Map<String, UUID> m_GroupUUID = new HashMap<String, UUID>();
+    private static Map<String, Integer> m_status = new HashMap<String, Integer>();
-     public UserInfo(UUID uuid, String Name, UUID Nation, UUID Squad, UUID Farm, UUID Party){ //UserInfo 초기화
+
-        super(100,100,1,10,10,10,10); //HP, MP, LEV, STR, DEX, INT, LUK
+    private int m_Nation;
+    private int m_Squad;
+    private int m_Farm;
+
+     public UserInfo(UUID uuid, String Name, int Nation, int Squad, int Farm){ //UserInfo 초기화
+        super(100,100,1,10,10,10,10);
         m_UUID = uuid;
         m_Name = Name;
-
+        m_Nation = Nation;
-        m_GroupUUID.put("Nation", Nation);
+        m_Squad = Squad;
-        m_GroupUUID.put("Squad", Squad);
+        m_Farm = Farm;
-        m_GroupUUID.put("Farm", Farm);
-        m_GroupUUID.put("Party", Party);
     }
 
-    public void SetGroupUUID(String GroupType, UUID m_UUID){ m_GroupUUID.put(GroupType, m_UUID); }
+    public void JoinNation(int Nation) { m_Nation = Nation; }
-    public UUID GetGroupUUID(String GroupType){ return m_GroupUUID.get(GroupType); }
+    public void JoinSquad(int Squad) { m_Squad = Squad; }
+    public void JoinFarm(int Farm) { m_Farm = Farm; }
+
     public String getUserName(){
         return m_Name;
     }
+
     public UUID getUserUUID(){ return m_UUID; }
 
+
 }