Index: java/com/l2jserver/gameserver/idfactory/IdFactory.java
===================================================================
--- java/com/l2jserver/gameserver/idfactory/IdFactory.java  (revision 5685)
+++ java/com/l2jserver/gameserver/idfactory/IdFactory.java  (working copy)
@@ -331,73 +331,44 @@
            Statement s = con.createStatement())
        {
            final TIntArrayList temp = new TIntArrayList();
-           try (ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM characters"))
-           {
-               rs.next();
-               temp.ensureCapacity(rs.getInt(1));
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT charId FROM characters"))
+           // ColumnThatHoldsOID, TableName
+           String[][] tables =
            {
-               while (rs.next())
                {
-                   temp.add(rs.getInt(1));
-               }
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM items"))
-           {
-               rs.next();
-               temp.ensureCapacity(temp.size() + rs.getInt(1));
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT object_id FROM items"))
-           {
-               while (rs.next())
+                   "charId",
+                   "characters"
+               },
                {
-                   temp.add(rs.getInt(1));
-               }
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM clan_data"))
-           {
-               rs.next();
-               temp.ensureCapacity(temp.size() + rs.getInt(1));
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data"))
-           {
-               while (rs.next())
+                   "object_id",
+                   "items"
+               },
+               {
+                   "clan_id",
+                   "clan_data"
+               },
+               {
+                   "object_id",
+                   "itemsonground"
+               },
                {
-                   temp.add(rs.getInt(1));
+                   "messageId",
+                   "messages"
                }
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM itemsonground"))
+           };
+           for (String[] str : tables)
            {
-               rs.next();
-               temp.ensureCapacity(temp.size() + rs.getInt(1));
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT object_id FROM itemsonground"))
-           {
-               while (rs.next())
+               try (ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM " + str[1]))
                {
-                   temp.add(rs.getInt(1));
+                   rs.next();
+                   temp.ensureCapacity(temp.size() + rs.getInt(1));
                }
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM messages"))
-           {
-               rs.next();
-               temp.ensureCapacity(temp.size() + rs.getInt(1));
-           }
-
-           try (ResultSet rs = s.executeQuery("SELECT messageId FROM messages"))
-           {
-               while (rs.next())
+
+               try (ResultSet rs = s.executeQuery("SELECT " + str[0] + " FROM " + str[1] + ""))
                {
-                   temp.add(rs.getInt(1));
+                   while (rs.next())
+                   {
+                       temp.add(rs.getInt(1));
+                   }
                }
            }
            temp.sort();