lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Action improvements.

Browse Source
This commit is contained in:
MobiusDev 2017-09-29 20:22:49 +00:00
parent 9634d8e911
commit 41c6b1ea80
12 changed files with 92 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
L2J_Mobius_1.0_Ertheia/dist/game/data/ActionData.xml vendored
View File

@ -5,8 +5,8 @@
<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="16" handler="PetAttack" /> <!-- Attack -->
<action id="17" handler="PetStop" /> <!-- Stop -->
<action id="19" handler="UnsummonPet" />
@ -119,7 +119,7 @@
<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
<action id="1071" handler="PetSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
@ -132,7 +132,7 @@
<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
<action id="1084" handler="ServitorSkillUse" option="6054" /> <!-- Switch State -->
<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
@ -199,20 +199,20 @@
<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
<action id="5000" handler="ServitorSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="ServitorSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="ServitorSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="ServitorSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="ServitorSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="ServitorSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="ServitorSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="ServitorSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="ServitorSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="ServitorSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="ServitorSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="ServitorSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="ServitorSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="ServitorSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="ServitorSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="ServitorSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
</list>

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerChat.java
View File

@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
public class OnPlayerChat implements IBaseEvent
{
private final L2PcInstance _activeChar;
private final L2PcInstance _target;
private final String _target;
private final String _text;
private final ChatType _type;
public OnPlayerChat(L2PcInstance activeChar, L2PcInstance target, String text, ChatType type)
public OnPlayerChat(L2PcInstance activeChar, String target, String text, ChatType type)
{
_activeChar = activeChar;
_target = target;
@ -44,7 +44,7 @@ public class OnPlayerChat implements IBaseEvent
return _activeChar;
}
public L2PcInstance getTarget()
public String getTarget()
{
return _target;
}

3
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -23,7 +23,6 @@ import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.handler.ChatHandler;
import com.l2jmobius.gameserver.handler.IChatHandler;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
@ -209,7 +208,7 @@ public final class Say2 implements IClientIncomingPacket
}
}
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, L2World.getInstance().getPlayer(_target), _text, chatType), activeChar, ChatFilterReturn.class);
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, _target, _text, chatType), activeChar, ChatFilterReturn.class);
if (filter != null)
{
_text = filter.getFilteredText();

38
L2J_Mobius_2.5_Underground/dist/game/data/ActionData.xml vendored
View File

@ -5,8 +5,8 @@
<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="16" handler="PetAttack" /> <!-- Attack -->
<action id="17" handler="PetStop" /> <!-- Stop -->
<action id="19" handler="UnsummonPet" />
@ -119,7 +119,7 @@
<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
<action id="1071" handler="PetSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
@ -132,7 +132,7 @@
<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
<action id="1084" handler="ServitorSkillUse" option="6054" /> <!-- Switch State -->
<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
@ -199,20 +199,20 @@
<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
<action id="5000" handler="ServitorSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="ServitorSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="ServitorSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="ServitorSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="ServitorSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="ServitorSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="ServitorSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="ServitorSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="ServitorSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="ServitorSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="ServitorSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="ServitorSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="ServitorSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="ServitorSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="ServitorSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="ServitorSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
</list>

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerChat.java
View File

@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
public class OnPlayerChat implements IBaseEvent
{
private final L2PcInstance _activeChar;
private final L2PcInstance _target;
private final String _target;
private final String _text;
private final ChatType _type;
public OnPlayerChat(L2PcInstance activeChar, L2PcInstance target, String text, ChatType type)
public OnPlayerChat(L2PcInstance activeChar, String target, String text, ChatType type)
{
_activeChar = activeChar;
_target = target;
@ -44,7 +44,7 @@ public class OnPlayerChat implements IBaseEvent
return _activeChar;
}
public L2PcInstance getTarget()
public String getTarget()
{
return _target;
}

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -23,7 +23,6 @@ import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.handler.ChatHandler;
import com.l2jmobius.gameserver.handler.IChatHandler;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
@ -209,7 +208,7 @@ public final class Say2 implements IClientIncomingPacket
}
}
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, L2World.getInstance().getPlayer(_target), _text, chatType), activeChar, ChatFilterReturn.class);
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, _target, _text, chatType), activeChar, ChatFilterReturn.class);
if (filter != null)
{
_text = filter.getFilteredText();

38
L2J_Mobius_3.0_Helios/dist/game/data/ActionData.xml vendored
View File

@ -5,8 +5,8 @@
<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="16" handler="PetAttack" /> <!-- Attack -->
<action id="17" handler="PetStop" /> <!-- Stop -->
<action id="19" handler="UnsummonPet" />
@ -119,7 +119,7 @@
<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
<action id="1071" handler="PetSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
@ -132,7 +132,7 @@
<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
<action id="1084" handler="ServitorSkillUse" option="6054" /> <!-- Switch State -->
<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
@ -199,20 +199,20 @@
<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
<action id="5000" handler="ServitorSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="ServitorSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="ServitorSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="ServitorSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="ServitorSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="ServitorSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="ServitorSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="ServitorSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="ServitorSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="ServitorSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="ServitorSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="ServitorSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="ServitorSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="ServitorSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="ServitorSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="ServitorSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
</list>

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerChat.java
View File

@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
public class OnPlayerChat implements IBaseEvent
{
private final L2PcInstance _activeChar;
private final L2PcInstance _target;
private final String _target;
private final String _text;
private final ChatType _type;
public OnPlayerChat(L2PcInstance activeChar, L2PcInstance target, String text, ChatType type)
public OnPlayerChat(L2PcInstance activeChar, String target, String text, ChatType type)
{
_activeChar = activeChar;
_target = target;
@ -44,7 +44,7 @@ public class OnPlayerChat implements IBaseEvent
return _activeChar;
}
public L2PcInstance getTarget()
public String getTarget()
{
return _target;
}

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -23,7 +23,6 @@ import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.handler.ChatHandler;
import com.l2jmobius.gameserver.handler.IChatHandler;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
@ -209,7 +208,7 @@ public final class Say2 implements IClientIncomingPacket
}
}
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, L2World.getInstance().getPlayer(_target), _text, chatType), activeChar, ChatFilterReturn.class);
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, _target, _text, chatType), activeChar, ChatFilterReturn.class);
if (filter != null)
{
_text = filter.getFilteredText();

38
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/ActionData.xml vendored
View File

@ -5,8 +5,8 @@
<action id="10" handler="PrivateStore" option="1" /> <!-- Private Store Sell -->
<action id="12" handler="SocialAction" option="2" /> <!-- Greeting -->
<action id="13" handler="SocialAction" option="3" /> <!-- Victory -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="14" handler="SocialAction" option="4" /> <!-- Advance -->
<action id="15" handler="PetHold" /> <!-- Change Movement Mode -->
<action id="16" handler="PetAttack" /> <!-- Attack -->
<action id="17" handler="PetStop" /> <!-- Stop -->
<action id="19" handler="UnsummonPet" />
@ -119,7 +119,7 @@
<action id="1068" handler="PetSkillUse" option="5751" /> <!-- Fox Shaman, Spirit Shaman - Lightning Wave -->
<action id="1069" handler="PetSkillUse" option="5752" /> <!-- Fox Shaman, Fairy Princess - Flare -->
<action id="1070" handler="PetSkillUse" option="5771" /> <!-- White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control -->
<action id="1071" handler="PetSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1071" handler="ServitorSkillUse" option="5761" /> <!-- Tigress - Power Strike -->
<action id="1072" handler="PetSkillUse" option="6046" /> <!-- Toy Knight - Piercing attack -->
<action id="1073" handler="PetSkillUse" option="6047" /> <!-- Toy Knight - Whirlwind -->
<action id="1074" handler="PetSkillUse" option="6048" /> <!-- Toy Knight - Lance Smash -->
@ -132,7 +132,7 @@
<action id="1081" handler="ServitorSkillUse" option="6042" /> <!-- Phoenix Cleanse -->
<action id="1082" handler="ServitorSkillUse" option="6043" /> <!-- Phoenix Flame Feather -->
<action id="1083" handler="ServitorSkillUse" option="6044" /> <!-- Phoenix Flame Beak -->
<action id="1084" handler="ServitorSkillUse" option="6054" /> <!-- Switch State -->
<action id="1084" handler="PetSkillUse" option="6054" /> <!-- Switch State -->
<action id="1086" handler="ServitorSkillUse" option="6094" /> <!-- Panther Cancel -->
<action id="1087" handler="ServitorSkillUse" option="6095" /> <!-- Panther Dark Claw -->
<action id="1088" handler="ServitorSkillUse" option="6096" /> <!-- Panther Fatal Claw -->
@ -199,20 +199,20 @@
<action id="1153" handler="ServitorSkillUse" option="11384" /> <!-- Dark Crusader - Phantom Blow -->
<action id="1154" handler="ServitorSkillUse" option="11385" /> <!-- Banshee Queen - Phantom Spike -->
<action id="1155" handler="ServitorSkillUse" option="11386" /> <!-- Banshee Queen - Phantom Crash -->
<action id="5000" handler="ServitorSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="ServitorSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="ServitorSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="ServitorSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="ServitorSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="ServitorSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="ServitorSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="ServitorSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="ServitorSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="ServitorSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="ServitorSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="ServitorSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="ServitorSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="ServitorSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="ServitorSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="ServitorSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
<action id="5000" handler="PetSkillUse" option="23155" /> <!-- Baby Rudolph - Reindeer Scratch -->
<action id="5001" handler="PetSkillUse" option="23167" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction -->
<action id="5002" handler="PetSkillUse" option="23168" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction -->
<action id="5003" handler="PetSkillUse" option="5749" /> <!-- Hyum, Lapham, Hyum, Lapham - Thunder Bolt -->
<action id="5004" handler="PetSkillUse" option="5750" /> <!-- Hyum, Lapham, Hyum, Lapham - Flash -->
<action id="5005" handler="PetSkillUse" option="5751" /> <!-- Hyum, Lapham, Hyum, Lapham - Lightning Wave -->
<action id="5006" handler="PetSkillUse" option="5771" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control -->
<action id="5007" handler="PetSkillUse" option="6046" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Piercing Attack -->
<action id="5008" handler="PetSkillUse" option="6047" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Spin Attack -->
<action id="5009" handler="PetSkillUse" option="6048" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Smash -->
<action id="5010" handler="PetSkillUse" option="6049" /> <!-- Deseloph, Lilias, Deseloph, Lilias - Ignite -->
<action id="5011" handler="PetSkillUse" option="6050" /> <!-- Rekang, Mafum, Rekang, Mafum - Power Smash -->
<action id="5012" handler="PetSkillUse" option="6051" /> <!-- Rekang, Mafum, Rekang, Mafum - Energy Burst -->
<action id="5013" handler="PetSkillUse" option="6052" /> <!-- Rekang, Mafum, Rekang, Mafum - Shockwave -->
<action id="5014" handler="PetSkillUse" option="6053" /> <!-- Rekang, Mafum, Rekang, Mafum - Ignite -->
<action id="5015" handler="PetSkillUse" option="6054" /> <!-- Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance -->
</list>

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/events/impl/character/player/OnPlayerChat.java
View File

@ -27,11 +27,11 @@ import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
public class OnPlayerChat implements IBaseEvent
{
private final L2PcInstance _activeChar;
private final L2PcInstance _target;
private final String _target;
private final String _text;
private final ChatType _type;
public OnPlayerChat(L2PcInstance activeChar, L2PcInstance target, String text, ChatType type)
public OnPlayerChat(L2PcInstance activeChar, String target, String text, ChatType type)
{
_activeChar = activeChar;
_target = target;
@ -44,7 +44,7 @@ public class OnPlayerChat implements IBaseEvent
return _activeChar;
}
public L2PcInstance getTarget()
public String getTarget()
{
return _target;
}

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -23,7 +23,6 @@ import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.handler.ChatHandler;
import com.l2jmobius.gameserver.handler.IChatHandler;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
@ -209,7 +208,7 @@ public final class Say2 implements IClientIncomingPacket
}
}
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, L2World.getInstance().getPlayer(_target), _text, chatType), activeChar, ChatFilterReturn.class);
final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new OnPlayerChat(activeChar, _target, _text, chatType), activeChar, ChatFilterReturn.class);
if (filter != null)
{
_text = filter.getFilteredText();