Misc fixes

This commit is contained in:
hondacrx
2021-05-18 13:46:40 -04:00
parent fb81030c75
commit 82eb0b2fd5
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -45,7 +45,7 @@ namespace Game.Chat
return false; return false;
} }
if (me.IsInCombat()) if (me.IsInCombat() && !handler.GetSession().HasPermission(RBACPermissions.CommandTeleName))
{ {
handler.SendSysMessage(CypherStrings.YouInCombat); handler.SendSysMessage(CypherStrings.YouInCombat);
return false; return false;
+1 -1
View File
@@ -268,7 +268,7 @@ namespace Game.Combat
for (var i = 0; i < redirInfo.Count; ++i) for (var i = 0; i < redirInfo.Count; ++i)
{ {
var pair = redirInfo[i]; // (victim,pct) var pair = redirInfo[i]; // (victim,pct)
Unit redirTarget = null; Unit redirTarget;
var refe = _myThreatListEntries.LookupByKey(pair.Item1); // try to look it up in our threat list first (faster) var refe = _myThreatListEntries.LookupByKey(pair.Item1); // try to look it up in our threat list first (faster)
if (refe != null) if (refe != null)