aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver
diff options
context:
space:
mode:
authorSpp <spp@jorge.gr>2013-03-08 13:15:25 +0100
committerSpp <spp@jorge.gr>2013-03-08 13:15:25 +0100
commit377cfdb5602cec4ce13d9d50937836aa7e03c446 (patch)
tree87ff543f2f3b6324bdeef491344b97a7394d82aa /src/server/worldserver
parentb4542c65048344019007a666a2bd35f9453d5664 (diff)
Core/RBAC: Fix multiple permissions and remove multiple config options that are currently implementes by RBAC
- Remove config options: CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT, CONFIG_ALLOW_TWO_SIDE_INTERACTION_MAIL, CONFIG_GM_LOG_TRADE, CONFIG_ALLOW_TWO_SIDE_ACCOUNTS, CONFIG_ALLOW_TWO_SIDE_WHO_LIST, CONFIG_ALLOW_GM_FRIEND, CONFIG_ALLOW_TWO_SIDE_ADD_FRIEND, CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL - Fix RBAC_PERM_SKIP_CHECK_CHAT_SPAM (Was checking spam for those that had the permission) - Only check RBAC_PERM_TWO_SIDE_INTERACTION_CHAT for sender of whispers (Restores GM being able to whisper players) - Only check RBAC_PERM_TWO_SIDE_INTERACTION_MAIL for sender - Fix .ticket assign <Player>, with last RBAC change it was changed by mistake from Player to Account
Diffstat (limited to 'src/server/worldserver')
-rw-r--r--src/server/worldserver/worldserver.conf.dist64
1 files changed, 0 insertions, 64 deletions
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 612793649b2..0802aca43ce 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -1200,13 +1200,6 @@ Warden.BanDuration = 86400
###################################################################################################
# PLAYER INTERACTION
#
-# AllowTwoSide.Accounts
-# Description: Allow creating characters of both factions on the same account.
-# Default: 1 - (Enabled)
-# 0 - (Disabled)
-
-AllowTwoSide.Accounts = 1
-
#
# AllowTwoSide.Interaction.Calendar
# Description: Allow calendar invites between factions.
@@ -1216,14 +1209,6 @@ AllowTwoSide.Accounts = 1
AllowTwoSide.Interaction.Calendar = 0
#
-# AllowTwoSide.Interaction.Chat
-# Description: Allow say chat between factions.
-# Default: 0 - (Disabled)
-# 1 - (Enabled)
-
-AllowTwoSide.Interaction.Chat = 0
-
-#
# AllowTwoSide.Interaction.Channel
# Description: Allow channel chat between factions.
# Default: 0 - (Disabled)
@@ -1256,30 +1241,6 @@ AllowTwoSide.Interaction.Guild = 0
AllowTwoSide.Interaction.Auction = 0
#
-# AllowTwoSide.Interaction.Mail
-# Description: Allow sending mails between factions.
-# Default: 0 - (Disabled)
-# 1 - (Enabled)
-
-AllowTwoSide.Interaction.Mail = 0
-
-#
-# AllowTwoSide.WhoList
-# Description: Show characters from both factions in the /who list.
-# Default: 0 - (Disabled)
-# 1 - (Enabled)
-
-AllowTwoSide.WhoList = 0
-
-#
-# AllowTwoSide.AddFriend
-# Description: Allow adding friends from other faction the friends list.
-# Default: 0 - (Disabled)
-# 1 - (Enabled)
-
-AllowTwoSide.AddFriend = 0
-
-#
# AllowTwoSide.Trade
# Description: Allow trading between factions.
# Default: 0 - (Disabled)
@@ -1534,15 +1495,6 @@ ChatFlood.MuteTime = 10
Channel.RestrictedLfg = 1
#
-# Channel.SilentlyGMJoin
-# Description: Silently join GM characters to channels. If set to 1, channel kick and ban
-# commands issued by a GM will not be broadcasted.
-# Default: 0 - (Disabled, Join with announcement)
-# 1 - (Enabled, Join without announcement)
-
-Channel.SilentlyGMJoin = 0
-
-#
# ChatLevelReq.Channel
# Description: Level requirement for characters to be able to write in chat channels.
# Default: 1
@@ -1646,14 +1598,6 @@ GM.InGMList.Level = 3
GM.InWhoList.Level = 3
#
-# GM.LogTrade
-# Description: Include GM trade and trade slot enchanting operations in GM log.
-# Default: 1 - (Enabled)
-# 0 - (Disabled)
-
-GM.LogTrade = 1
-
-#
# GM.StartLevel
# Description: GM character starting level.
# Default: 1
@@ -1669,14 +1613,6 @@ GM.StartLevel = 1
GM.AllowInvite = 0
#
-# GM.AllowFriend
-# Description: Allow players to add GM characters to their friends list.
-# Default: 0 - (Disabled)
-# 1 - (Enabled)
-
-GM.AllowFriend = 0
-
-#
# GM.LowerSecurity
# Description: Allow lower security levels to use commands on higher security level
# characters.