Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
This commit is contained in:
Carbenium
2015-07-21 18:30:05 +02:00
parent 9f1d71a53f 799bdc1710
commit 68fd138476
10 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/worldserver/worldserver.conf.dist
View File

@@ -27,6 +27,9 @@
# CONSOLE AND REMOTE ACCESS
# CHARACTER DELETE OPTIONS
# CUSTOM SERVER OPTIONS
# AUCTION HOUSE BOT SETTINGS
# AUCTION HOUSE BOT ITEM FINE TUNING
# AUCTION HOUSE BOT BUYER CONFIG
# LOGGING SYSTEM SETTINGS
# CURRENCIES SETTINGS
# PACKET SPOOF PROTECTION SETTINGS
@@ -2871,8 +2874,8 @@ AuctionHouseBot.Class.Glyph = 3
###################################################################################################
###################################################################################################
# AUCTION HOUSE BOT ITEM FINE TUNING
#
# AHBot ITEM FINE TUNING
# The following are usefull for limiting what character levels can
# benefit from the auction house
#
@@ -2945,7 +2948,7 @@ AuctionHouseBot.forceExcludeItems = ""
###################################################################################################
###################################################################################################
# AHBot Buyer config
# AUCTION HOUSE BOT BUYER CONFIG
#
# AuctionHouseBot.Buyer.Enabled
# Description: General enable or disable AuctionHouseBot Buyer functionality