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

Handle localisations with null parameters.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-07-13 08:29:27 +00:00
parent 9c27bf30d6
commit 6d4d57cf6c
26 changed files with 65 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowScreenMessage.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.l2jmobius.commons.network.PacketWriter;
@@ -287,7 +288,7 @@ public class ExShowScreenMessage implements IClientOutgoingPacket
packet.writeD(_time);
packet.writeD(_fade ? 0x01 : 0x00);
packet.writeD(-1);
packet.writeS(_parameters != null ? sml.getLocalisation(_parameters) : _text);
packet.writeS(sml.getLocalisation(_parameters != null ? _parameters : Collections.EMPTY_LIST));
return true;
}
}
@@ -311,7 +312,7 @@ public class ExShowScreenMessage implements IClientOutgoingPacket
packet.writeD(_time);
packet.writeD(_fade ? 0x01 : 0x00);
packet.writeD(-1);
packet.writeS(_parameters != null ? nsl.getLocalisation(_parameters) : _text);
packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.EMPTY_LIST));
return true;
}
}

3
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/NpcSay.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.l2jmobius.commons.network.PacketWriter;
@@ -141,7 +142,7 @@ public final class NpcSay implements IClientOutgoingPacket
if (nsl != null)
{
packet.writeD(-1);
packet.writeS(nsl.getLocalisation(_parameters));
packet.writeS(nsl.getLocalisation(_parameters != null ? _parameters : Collections.EMPTY_LIST));
return true;
}
}