From ff777b1004677e16d4d31ef3975e4b59f51bac3e Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 12 Aug 2017 10:28:05 +0000 Subject: [PATCH] Removed wrong guard social actions. --- .../gameserver/model/actor/instance/L2GuardInstance.java | 6 ------ .../gameserver/model/actor/instance/L2GuardInstance.java | 6 ------ .../gameserver/model/actor/instance/L2GuardInstance.java | 6 ------ 3 files changed, 18 deletions(-) diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 26fe224cbe..aa4f132fce 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; 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.skills.Skill; 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. @@ -185,10 +183,6 @@ public class L2GuardInstance extends L2Attackable } 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); // Open a chat window on client with the text of the L2GuardInstance diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 26fe224cbe..aa4f132fce 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; 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.skills.Skill; 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. @@ -185,10 +183,6 @@ public class L2GuardInstance extends L2Attackable } 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); // Open a chat window on client with the text of the L2GuardInstance diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 26fe224cbe..aa4f132fce 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; 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.skills.Skill; 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. @@ -185,10 +183,6 @@ public class L2GuardInstance extends L2Attackable } 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); // Open a chat window on client with the text of the L2GuardInstance