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

Fixed probable bait location NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-11-01 14:45:20 +00:00
parent b61517956d
commit b6ec8029d4
17 changed files with 204 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -217,9 +217,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -217,9 +217,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -219,9 +219,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -220,9 +220,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -217,9 +217,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -219,9 +219,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -218,9 +218,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed

15
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@ -220,9 +220,18 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed packet.writeC(_player.isFishing() ? 1 : 0); // Confirmed
final ILocational baitLocation = _player.getFishing().getBaitLocation(); final ILocational baitLocation = _player.getFishing().getBaitLocation();
packet.writeD(baitLocation.getX()); // Confirmed if (baitLocation != null)
packet.writeD(baitLocation.getY()); // Confirmed {
packet.writeD(baitLocation.getZ()); // Confirmed packet.writeD(baitLocation.getX()); // Confirmed
packet.writeD(baitLocation.getY()); // Confirmed
packet.writeD(baitLocation.getZ()); // Confirmed
}
else
{
packet.writeD(0);
packet.writeD(0);
packet.writeD(0);
}
packet.writeD(_player.getAppearance().getNameColor()); // Confirmed packet.writeD(_player.getAppearance().getNameColor()); // Confirmed