aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAokromes <Aokromes@users.noreply.github.com>2016-07-31 13:35:08 +0200
committerjoschiwald <joschiwald.trinity@gmail.com>2017-02-11 20:55:14 +0100
commit3b9efd35dfa9d434c6bd9b19ae68900d88eb85ca (patch)
tree5214501adba3508a078897450a5baad44ee6bcc6
parent9c09a0bd75271c01882ed2673a0abaefb2bd9dbd (diff)
Core/PVP: Move report AFK requirement to config (#17699)
(cherry picked from commit 633264f58f55c793a0ea8efbf9abafe3d3e85d33) # Conflicts: # src/server/game/Entities/Player/Player.cpp # src/server/game/World/World.cpp
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
-rw-r--r--src/server/game/World/World.cpp11
-rw-r--r--src/server/game/World/World.h1
-rw-r--r--src/server/worldserver/worldserver.conf.dist8
4 files changed, 22 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 1979a05c11f..f03c3a87ab8 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -22759,8 +22759,8 @@ void Player::ReportedAfkBy(Player* reporter)
if (m_bgData.bgAfkReporter.find(reporter->GetGUID()) == m_bgData.bgAfkReporter.end() && !HasAura(43680) && !HasAura(43681) && reporter->CanReportAfkDueToLimit())
{
m_bgData.bgAfkReporter.insert(reporter->GetGUID());
- // 3 players have to complain to apply debuff
- if (m_bgData.bgAfkReporter.size() >= 3)
+ // by default 3 players have to complain to apply debuff
+ if (m_bgData.bgAfkReporter.size() >= sWorld->getIntConfig(CONFIG_BATTLEGROUND_REPORT_AFK))
{
// cast 'Idle' spell
CastSpell(this, 43680, true);
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 3269fd615cb..e2f78a9a753 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1154,6 +1154,17 @@ void World::LoadConfigSettings(bool reload)
m_bool_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE] = sConfigMgr->GetBoolDefault("Battleground.QueueAnnouncer.Enable", false);
m_bool_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY] = sConfigMgr->GetBoolDefault("Battleground.QueueAnnouncer.PlayerOnly", false);
m_bool_configs[CONFIG_BATTLEGROUND_STORE_STATISTICS_ENABLE] = sConfigMgr->GetBoolDefault("Battleground.StoreStatistics.Enable", false);
+ m_int_configs[CONFIG_BATTLEGROUND_REPORT_AFK] = sConfigMgr->GetIntDefault("Battleground.ReportAFK", 3);
+ if (m_int_configs[CONFIG_BATTLEGROUND_REPORT_AFK] < 1)
+ {
+ TC_LOG_ERROR("server.loading", "Battleground.ReportAFK (%d) must be >0. Using 3 instead.", m_int_configs[CONFIG_BATTLEGROUND_REPORT_AFK]);
+ m_int_configs[CONFIG_BATTLEGROUND_REPORT_AFK] = 3;
+ }
+ if (m_int_configs[CONFIG_BATTLEGROUND_REPORT_AFK] > 9)
+ {
+ TC_LOG_ERROR("server.loading", "Battleground.ReportAFK (%d) must be <10. Using 3 instead.", m_int_configs[CONFIG_BATTLEGROUND_REPORT_AFK]);
+ m_int_configs[CONFIG_BATTLEGROUND_REPORT_AFK] = 3;
+ }
m_int_configs[CONFIG_BATTLEGROUND_INVITATION_TYPE] = sConfigMgr->GetIntDefault ("Battleground.InvitationType", 0);
m_int_configs[CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER] = sConfigMgr->GetIntDefault ("Battleground.PrematureFinishTimer", 5 * MINUTE * IN_MILLISECONDS);
m_int_configs[CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH] = sConfigMgr->GetIntDefault ("Battleground.PremadeGroupWaitForMatch", 30 * MINUTE * IN_MILLISECONDS);
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index 907a450bbac..1e3695e84b0 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -316,6 +316,7 @@ enum WorldIntConfigs
CONFIG_BATTLEGROUND_INVITATION_TYPE,
CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER,
CONFIG_BATTLEGROUND_PREMADE_GROUP_WAIT_FOR_MATCH,
+ CONFIG_BATTLEGROUND_REPORT_AFK,
CONFIG_ARENA_MAX_RATING_DIFFERENCE,
CONFIG_ARENA_RATING_DISCARD_TIMER,
CONFIG_ARENA_RATED_UPDATE_TIMER,
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index c1f326b8215..d781afe9a43 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -2512,6 +2512,14 @@ Battleground.RewardLoserHonorFirst = 4500
Battleground.RewardLoserHonorLast = 3500
#
+# Battleground.ReportAFK
+# Description: Number of reports needed to kick someone AFK from Battleground.
+# Range: 1-9
+# Default: 3
+
+Battleground.ReportAFK = 3
+
+#
###################################################################################################
###################################################################################################