From d2e926851de9753ca202d65f4c93a99f5a8f8cd0 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 19 Aug 2019 09:20:59 +0000 Subject: [PATCH] Fixed ExFriendDetailInfo NPE. --- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- .../network/serverpackets/friend/ExFriendDetailInfo.java | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java index 72c8c43dfb..bd4ac6d8bb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/friend/ExFriendDetailInfo.java @@ -39,7 +39,7 @@ public class ExFriendDetailInfo implements IClientOutgoingPacket _objectId = player.getObjectId(); _name = name; _friend = World.getInstance().getPlayer(_name); - _lastAccess = _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; + _lastAccess = (_friend == null) || _friend.isBlocked(player) ? 0 : _friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - _friend.getLastAccess()) / 1000; } @Override