git pushMerge branch 'master' of https://git.eq2emu.com/devn00b/EQ2EMu

EQ2/source/WorldServer/Entity.h

@@ -280,7 +280,7 @@ struct InfoStruct{
 		reload_player_spells_ = 0;
 		
 		group_loot_method_ = 1;
-		group_loot_items_rarity_ = 1;
+		group_loot_items_rarity_ = 0;
 		group_auto_split_ = 1;
 		group_default_yell_ = 1;
 		group_autolock_ = 0;

EQ2/source/WorldServer/Items/ItemsDB.cpp

@@ -1282,7 +1282,7 @@ void WorldDatabase::LoadCharacterItemList(int32 account_id, int32 char_id, Playe
 
 	Query query;
 	MYSQL_ROW row;
-	MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT type, id, slot, item_id, creator,adorn0,adorn1,adorn2, condition_, attuned, bag_id, count, max_sell_value, no_sale, UNIX_TIMESTAMP(last_saved), UNIX_TIMESTAMP(created) FROM character_items where char_id = %u or (bag_id = -4 and account_id = %u) ORDER BY slot asc", char_id, account_id);
+	MYSQL_RES* result = query.RunQuery2(Q_SELECT, "SELECT type, id, slot, item_id, creator,adorn0,adorn1,adorn2, condition_, attuned, bag_id, count, max_sell_value, no_sale, UNIX_TIMESTAMP(last_saved), UNIX_TIMESTAMP(created) FROM character_items where char_id = %u or (bag_id = -4 and account_id = %u) ORDER BY bag_id, slot asc", char_id, account_id);
 
 	if(result)
 	{

EQ2/source/WorldServer/Tradeskills/TradeskillsPackets.cpp

@@ -279,10 +279,10 @@ void ClientPacketFunctions::SendCreateFromRecipe(Client* client, int32 recipeID)
 					}
 				}
 			}
-			packet->setArrayLengthByName("num_build_items_selected", selected_items.size());
+			packet->setSubArrayLengthByName("num_build_items_selected", selected_items.size(),index   );
 			for (int8 i = 0; i < selected_items.size(); i++) {
-				packet->setArrayDataByName("build_selected_item_qty", selected_items[i].second, i);
-				packet->setArrayDataByName("build_selected_id", selected_items[i].first, i);
+				packet->setSubArrayDataByName("build_selected_item_qty", selected_items[i].second,index, i);
+				packet->setSubArrayDataByName("build_selected_item_id", selected_items[i].first,index, i);
 
 			}
 			int16 qty = 0;

server/WorldStructs.xml

@@ -16174,7 +16174,7 @@ to zero and treated like placeholders." />
   <Data ElementName="fuel_item_id" Type="int32" Size="1" />
   <Data ElementName="fuel_icon" Type="int16" />
   <Data ElementName="fuel_total_quantity" Type="int8" Size="1" />
-  <Data ElementName="fuel_unknown4" Type="int8" Size="2" />
+ 
 </Data>
 <Data ElementName="num_fuel_items_selected" Type="int8" />
 <Data ElementName="fuel_items_selected_array" Type="Array" ArraySizeVariable="num_fuel_items_selected">