|
@@ -1123,7 +1123,7 @@ namespace XmdsCommonServer.Plugin
|
|
|
|
|
|
protected virtual void ChangeCombatStateFromAtk(XmdsVirtual target)
|
|
|
{
|
|
|
- var s = target.IsPlayerUnit() ? BattleStatus.PVP : BattleStatus.PVE;
|
|
|
+ var s = (this.IsPlayerUnit() && target.IsPlayerUnit()) ? BattleStatus.PVP : BattleStatus.PVE;
|
|
|
SetCombatState(s, 0, target.mUnit.PlayerUUID);
|
|
|
}
|
|
|
|
|
@@ -1375,7 +1375,7 @@ namespace XmdsCommonServer.Plugin
|
|
|
|
|
|
attacker.ChangeCombatStateFromAtk(this);
|
|
|
mHateSystem.OnHitted(attacker, this, damage, ref result);
|
|
|
- var v = attacker.IsPlayerUnit() ? BattleStatus.PVP : BattleStatus.PVE;
|
|
|
+ var v = (this.IsPlayerUnit() && attacker.IsPlayerUnit()) ? BattleStatus.PVP : BattleStatus.PVE;
|
|
|
|
|
|
|
|
|
if (v == BattleStatus.PVP && CombatState != BattleStatus.PVP)
|
|
@@ -1416,7 +1416,7 @@ namespace XmdsCommonServer.Plugin
|
|
|
|
|
|
if (this.mUnit.CurrentHP - damage > 0)
|
|
|
{
|
|
|
- var s = attacker.IsPlayerUnit() ? BattleStatus.PVP : BattleStatus.PVE;
|
|
|
+ var s = (this.IsPlayerUnit() && attacker.IsPlayerUnit()) ? BattleStatus.PVP : BattleStatus.PVE;
|
|
|
|
|
|
|
|
|
if (s == BattleStatus.PVP && CombatState != BattleStatus.PVP)
|