Toggle skills should not broadcast MagicSkillUse.

This commit is contained in:
MobiusDev
2019-01-25 00:53:36 +00:00
parent 83b42bef7b
commit 916c986aef
12 changed files with 34 additions and 28 deletions

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -1793,8 +1793,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
// To turn local player in target direction // To turn local player in target direction
setHeading(Util.calculateHeadingFrom(getX(), getY(), target.getX(), target.getY())); setHeading(Util.calculateHeadingFrom(getX(), getY(), target.getX(), target.getY()));
// Like L2OFF after a skill the player must stop the movement, also with toggle // Like L2OFF after a skill the player must stop the movement, unless it is toggle or potion.
if (!skill.isPotion() && (this instanceof L2PcInstance)) if (!skill.isToggle() && !skill.isPotion() && (this instanceof L2PcInstance))
{ {
((L2PcInstance) this).stopMove(null); ((L2PcInstance) this).stopMove(null);
} }
@@ -1805,9 +1805,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
callSkill(skill, targets); callSkill(skill, targets);
} }
// Send a Server->Client packet MagicSkillUse with target, displayId, level, skillTime, reuseDelay if (!skill.isToggle())
// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character {
broadcastPacket(new MagicSkillUse(this, target, displayId, level, hitTime, reuseDelay)); // Send a Server->Client packet MagicSkillUse with target, displayId, level, skillTime, reuseDelay
// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
broadcastPacket(new MagicSkillUse(this, target, displayId, level, hitTime, reuseDelay));
}
// Send a system message USE_S1 to the L2Character // Send a system message USE_S1 to the L2Character
if ((activeChar instanceof L2PcInstance) && (magicId != 1312)) if ((activeChar instanceof L2PcInstance) && (magicId != 1312))

View File

@@ -1831,9 +1831,12 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
} }
} }
// Send a Server->Client packet MagicSkillUser with target, displayId, level, skillTime, reuseDelay if (!skill.isToggle())
// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character {
broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getDisplayLevel(), skillTime, reuseDelay)); // Send a Server->Client packet MagicSkillUser with target, displayId, level, skillTime, reuseDelay
// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getDisplayLevel(), skillTime, reuseDelay));
}
// Send a system message to the player. // Send a system message to the player.
if (isPlayer() && !skill.isAbnormalInstant()) if (isPlayer() && !skill.isAbnormalInstant())

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**

View File

@@ -220,7 +220,7 @@ public enum SkillOperateType
*/ */
public boolean isHidingMesseges() public boolean isHidingMesseges()
{ {
return (this == A5) || (this == A6) || (this == TG) || (this == P); return (this == P) || (this == A5) || (this == A6) || (this == TG);
} }
/** /**
@@ -228,7 +228,7 @@ public enum SkillOperateType
*/ */
public boolean isNotBroadcastable() public boolean isNotBroadcastable()
{ {
return (this == A5) || (this == A6) || (this == AU) || (this == TG); return (this == AU) || (this == A5) || (this == A6) || (this == TG) || (this == T);
} }
/** /**