Skip to content
Snippets Groups Projects
Commit f7625328 authored by Nos's avatar Nos
Browse files

BETA: Changed `Bluff` effect conditions to be retail-like.

parent 4b57a42a
No related branches found
No related tags found
No related merge requests found
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
package handlers.effecthandlers; package handlers.effecthandlers;
import com.l2jserver.gameserver.model.StatsSet; import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance; import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
import com.l2jserver.gameserver.model.conditions.Condition; import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect; import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.skills.BuffInfo; import com.l2jserver.gameserver.model.skills.BuffInfo;
...@@ -58,13 +57,16 @@ public final class Bluff extends AbstractEffect ...@@ -58,13 +57,16 @@ public final class Bluff extends AbstractEffect
@Override @Override
public void onStart(BuffInfo info) public void onStart(BuffInfo info)
{ {
if ((info.getEffected() instanceof L2NpcInstance) || (info.getEffected().isNpc() && (info.getEffected().getId() == 35062)) || (info.getEffected() instanceof L2SiegeSummonInstance)) final L2Character effected = info.getEffected();
// Headquarters NPC should not rotate
if ((effected.getId() == 35062) || effected.isRaid() || effected.isRaidMinion())
{ {
return; return;
} }
info.getEffected().broadcastPacket(new StartRotation(info.getEffected().getObjectId(), info.getEffected().getHeading(), 1, 65535)); final L2Character effector = info.getEffector();
info.getEffected().broadcastPacket(new StopRotation(info.getEffected().getObjectId(), info.getEffector().getHeading(), 65535)); effected.broadcastPacket(new StartRotation(effected.getObjectId(), effected.getHeading(), 1, 65535));
info.getEffected().setHeading(info.getEffector().getHeading()); effected.broadcastPacket(new StopRotation(effected.getObjectId(), effector.getHeading(), 65535));
effected.setHeading(effector.getHeading());
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment