Merge branch 'master' of https://github.com/EQEmu/Server

utils/sql/data_tables.txt

@@ -0,0 +1,5 @@
+command_settings
+launcher
+rule_sets
+rule_values
+variables

utils/sql/system_tables.txt

@@ -0,0 +1,100 @@
+aa_ability
+aa_actions
+aa_effects
+aa_required_level_cost
+aa_ranks
+aa_rank_effects
+aa_rank_prereqs
+activities
+adventure_template
+adventure_template_entry
+adventure_template_entry_flavor
+altadv_vars
+alternate_currency
+base_data
+blocked_spells
+books
+char_create_combinations
+char_create_point_allocations
+class_skill
+damageshieldtypes
+doors
+faction_list
+faction_list_mod
+fear_hints
+fishing
+forage
+goallists
+graveyard
+grid
+grid_entries
+ground_spawns
+horses
+instance_list
+items
+ldon_trap_templates
+ldon_trap_entries
+level_exp_mods
+lootdrop
+lootdrop_entries
+loottable
+loottable_entries
+merc_armorinfo
+merc_weaponinfo
+merc_stats
+merc_merchant_entries
+merc_merchant_template_entries
+merc_merchant_templates
+merc_stance_entries
+merc_templates
+merc_npc_types
+merc_name_types
+merc_subtypes 
+merc_types
+merc_spell_list_entries
+merc_spell_lists
+merc_buffs
+mercs
+merc_inventory 
+merchantlist
+npc_emotes
+npc_faction
+npc_faction_entries
+npc_spells
+npc_spells_entries
+npc_spells_effects
+npc_spells_effects_entries
+npc_types
+npc_types_metadata
+npc_types_tint
+object
+pets
+pets_equipmentset
+pets_equipmentset_entries
+proximities
+races
+saylink
+skill_caps
+spawn2
+spawn_conditions
+spawn_condition_values
+spawn_events
+spawnentry
+spawngroup
+spells_new
+start_zones
+starting_items
+tasks
+tasksets
+titles
+tradeskill_recipe
+tradeskill_recipe_entries
+traps
+tribute_levels
+tributes
+veteran_reward_templates
+zone
+zone_points
+zone_server
+zone_state_dump
+zoneserver_auth

utils/sql/user_tables.txt

@@ -0,0 +1,93 @@
+aa_timers
+account
+account_flags
+account_ip
+account_rewards
+adventure_details
+adventure_members
+adventure_stats
+Banned_IPs
+bugs
+buyer
+char_recipe_list
+character_data
+character_currency
+character_alternate_abilities
+character_bind
+character_corpses
+character_corpse_items
+character_languages
+character_lookup
+character_skills
+character_spells
+character_memmed_spells
+character_disciplines
+character_material
+character_tribute
+character_bandolier
+character_potionbelt
+character_inspect_messages
+character_leadership_abilities
+character_activities
+character_alt_currency
+character_backup
+character_buffs
+character_enabledtasks
+character_pet_buffs
+character_pet_info
+character_pet_inventory
+character_tasks
+chatchannels
+completed_tasks
+discovered_items
+eventlog
+faction_values
+friends
+gm_ips
+group_id
+group_leaders
+guilds
+guild_bank
+guild_ranks
+guild_relations
+guild_members
+hackers
+instance_list_player
+inventory
+item_tick
+keyring
+launcher_zones
+lfguild
+mail
+merchantlist_temp
+name_filter
+object_contents
+petitions
+player_titlesets
+qs_player_move_record
+qs_player_move_record_entries
+qs_player_npc_kill_record
+qs_player_npc_kill_record_entries
+qs_player_speech
+qs_player_trade_record
+qs_player_trade_record_entries
+qs_merchant_transaction_record
+qs_merchant_transaction_record_entries
+qs_player_delete_record
+qs_player_delete_record_entries
+qs_player_handin_record
+qs_player_handin_record_entries
+qs_player_aa_rate_hourly
+qs_player_events
+quest_globals
+raid_details
+raid_leaders
+raid_members
+reports
+respawn_times
+sharedbank
+spell_globals
+timers
+trader
+trader_audit
+zone_flags

zone/client.cpp

@@ -8904,7 +8904,7 @@ void Client::ProcessAggroMeter()
 		if (m_aggrometer.set_pct(AggroMeter::AT_Group3, 0))
 			add_entry(AggroMeter::AT_Group3);
 		if (m_aggrometer.set_pct(AggroMeter::AT_Group4, 0))
-			add_entry(AggroMeter::AT_Group5);
+			add_entry(AggroMeter::AT_Group4);
 		if (m_aggrometer.set_pct(AggroMeter::AT_Group5, 0))
 			add_entry(AggroMeter::AT_Group5);
 	}