Removed wrong guard social actions.
This commit is contained in:
@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
|
|||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import com.l2jmobius.Config;
|
import com.l2jmobius.Config;
|
||||||
import com.l2jmobius.commons.util.Rnd;
|
|
||||||
import com.l2jmobius.gameserver.ai.CtrlIntention;
|
import com.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import com.l2jmobius.gameserver.enums.InstanceType;
|
import com.l2jmobius.gameserver.enums.InstanceType;
|
||||||
import com.l2jmobius.gameserver.model.L2World;
|
import com.l2jmobius.gameserver.model.L2World;
|
||||||
@@ -31,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventType;
|
|||||||
import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
|
import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance.
|
* This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance.
|
||||||
@@ -185,10 +183,6 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet SocialAction to the all L2PcInstance on the _knownPlayer of the L2NpcInstance
|
|
||||||
// to display a social action of the L2GuardInstance on their client
|
|
||||||
broadcastPacket(new SocialAction(getObjectId(), Rnd.nextInt(8)));
|
|
||||||
|
|
||||||
player.setLastFolkNPC(this);
|
player.setLastFolkNPC(this);
|
||||||
|
|
||||||
// Open a chat window on client with the text of the L2GuardInstance
|
// Open a chat window on client with the text of the L2GuardInstance
|
||||||
|
@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
|
|||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import com.l2jmobius.Config;
|
import com.l2jmobius.Config;
|
||||||
import com.l2jmobius.commons.util.Rnd;
|
|
||||||
import com.l2jmobius.gameserver.ai.CtrlIntention;
|
import com.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import com.l2jmobius.gameserver.enums.InstanceType;
|
import com.l2jmobius.gameserver.enums.InstanceType;
|
||||||
import com.l2jmobius.gameserver.model.L2World;
|
import com.l2jmobius.gameserver.model.L2World;
|
||||||
@@ -31,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventType;
|
|||||||
import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
|
import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance.
|
* This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance.
|
||||||
@@ -185,10 +183,6 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet SocialAction to the all L2PcInstance on the _knownPlayer of the L2NpcInstance
|
|
||||||
// to display a social action of the L2GuardInstance on their client
|
|
||||||
broadcastPacket(new SocialAction(getObjectId(), Rnd.nextInt(8)));
|
|
||||||
|
|
||||||
player.setLastFolkNPC(this);
|
player.setLastFolkNPC(this);
|
||||||
|
|
||||||
// Open a chat window on client with the text of the L2GuardInstance
|
// Open a chat window on client with the text of the L2GuardInstance
|
||||||
|
@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
|
|||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import com.l2jmobius.Config;
|
import com.l2jmobius.Config;
|
||||||
import com.l2jmobius.commons.util.Rnd;
|
|
||||||
import com.l2jmobius.gameserver.ai.CtrlIntention;
|
import com.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import com.l2jmobius.gameserver.enums.InstanceType;
|
import com.l2jmobius.gameserver.enums.InstanceType;
|
||||||
import com.l2jmobius.gameserver.model.L2World;
|
import com.l2jmobius.gameserver.model.L2World;
|
||||||
@@ -31,7 +30,6 @@ import com.l2jmobius.gameserver.model.events.EventType;
|
|||||||
import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
|
import com.l2jmobius.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
|
||||||
import com.l2jmobius.gameserver.model.skills.Skill;
|
import com.l2jmobius.gameserver.model.skills.Skill;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance.
|
* This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance.
|
||||||
@@ -185,10 +183,6 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Send a Server->Client packet SocialAction to the all L2PcInstance on the _knownPlayer of the L2NpcInstance
|
|
||||||
// to display a social action of the L2GuardInstance on their client
|
|
||||||
broadcastPacket(new SocialAction(getObjectId(), Rnd.nextInt(8)));
|
|
||||||
|
|
||||||
player.setLastFolkNPC(this);
|
player.setLastFolkNPC(this);
|
||||||
|
|
||||||
// Open a chat window on client with the text of the L2GuardInstance
|
// Open a chat window on client with the text of the L2GuardInstance
|
||||||
|
Reference in New Issue
Block a user