From b22822f3e0ae95f5218142a519d32d3e0f36db92 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 12 Jun 2021 21:48:46 +0000
Subject: [PATCH] Fixed probable ExPledgeRankingList NPE.

---
 .../org/l2jmobius/gameserver/instancemanager/RankManager.java | 4 ++--
 .../network/serverpackets/ranking/ExPledgeRankingList.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/RankManager.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/RankManager.java
index 0312a14002..27eaf298ff 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/RankManager.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/instancemanager/RankManager.java
@@ -239,7 +239,7 @@ public class RankManager
 					player.set("petLevel", rset.getInt("petLevel"));
 					player.set("clanName", rset.getInt("clanid") > 0 ? ClanTable.getInstance().getClan(rset.getInt("clanid")).getName() : "");
 					player.set("petType", PetDataTable.getInstance().getTypeByIndex(rset.getInt("index")));
-					player.set("exp", rset.getInt("exp"));
+					player.set("exp", rset.getLong("exp"));
 					player.set("controlledItemObjId", rset.getInt("item_obj_id"));
 					_mainPetList.put(i, player);
 					i++;
@@ -265,7 +265,7 @@ public class RankManager
 					player.set("clan_level", rset.getInt("clan_level"));
 					player.set("clan_name", rset.getString("clan_name"));
 					player.set("reputation_score", rset.getInt("reputation_score"));
-					player.set("exp", rset.getInt("exp"));
+					player.set("exp", rset.getLong("exp"));
 					player.set("clan_id", rset.getInt("clan_id"));
 					_mainClanList.put(i, player);
 					i++;
diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java
index daf7110d99..93a5dfd428 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPledgeRankingList.java
@@ -93,7 +93,7 @@ public class ExPledgeRankingList implements IClientOutgoingPacket
 			packet.writeString(player.getString("char_name"));
 			packet.writeD(player.getInt("level"));
 			packet.writeD(ClanTable.getInstance().getClan(player.getInt("clan_id")) != null ? ClanTable.getInstance().getClan(player.getInt("clan_id")).getMembersCount() : 0);
-			packet.writeD(player.getInt("exp"));
+			packet.writeD((int) Math.min(Integer.MAX_VALUE, player.getLong("exp")));
 		}
 	}
 }