Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Chat: fix RBAC_PERM_COMMANDS_NOTIFY_COMMAND_NOT_FOUND_ERROR for subcommands

Browse Source
This commit is contained in:
hondacrx
2018-03-12 14:40:58 -04:00
parent 05ecb41a10
commit b9c1e3876b
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Framework/Constants/SharedConst.cs
-1
View File
@@ -967,7 +967,6 @@ namespace Framework.Constants
AhbotUpdateInterval, AhbotUpdateInterval,
AllTaxiPaths, AllTaxiPaths,
AllowGmGroup, AllowGmGroup,
AllowPlayerCommands,
AllowTrackBothResources, AllowTrackBothResources,
AllowTwoSideInteractionAuction, AllowTwoSideInteractionAuction,
AllowTwoSideInteractionCalendar, AllowTwoSideInteractionCalendar,
Source/Game/Chat/CommandHandler.cs
+3
View File
@@ -107,6 +107,9 @@ namespace Game.Chat
string arg = args.NextString(""); string arg = args.NextString("");
if (!ExecuteCommandInTable(command.ChildCommands, arg, fullcmd)) if (!ExecuteCommandInTable(command.ChildCommands, arg, fullcmd))
{ {
if (_session != null && !_session.HasPermission(RBACPermissions.CommandsNotifyCommandNotFoundError))
return false;
if (!arg.IsEmpty()) if (!arg.IsEmpty())
SendSysMessage(CypherStrings.NoSubcmd); SendSysMessage(CypherStrings.NoSubcmd);
else else
Source/Game/Entities/Unit/Unit.Combat.cs
+2 -2
View File
@@ -2668,10 +2668,10 @@ namespace Game.Entities
float DoneTotalMod = 1.0f; float DoneTotalMod = 1.0f;
// Some spells don't benefit from pct done mods // Some spells don't benefit from pct done mods
if (spellProto != null) if (spellProto != null && !spellProto.HasAttribute(SpellAttr6.NoDonePctDamageMods))
{ {
// mods for SPELL_SCHOOL_MASK_NORMAL are already factored in base melee damage calculation // mods for SPELL_SCHOOL_MASK_NORMAL are already factored in base melee damage calculation
if (!spellProto.HasAttribute(SpellAttr6.NoDonePctDamageMods) && !spellProto.GetSchoolMask().HasAnyFlag(SpellSchoolMask.Normal)) if (!spellProto.GetSchoolMask().HasAnyFlag(SpellSchoolMask.Normal))
{ {
float maxModDamagePercentSchool = 0.0f; float maxModDamagePercentSchool = 0.0f;
for (var i = SpellSchools.Holy; i < SpellSchools.Max; ++i) for (var i = SpellSchools.Holy; i < SpellSchools.Max; ++i)