From f33a219ee69129d8cf2187b166248b2d573e54a6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 23 Apr 2022 10:00:28 +0000
Subject: [PATCH] Fixed some null SystemMessageId parameters. Thanks to
 kinghanker.

---
 .../gameserver/network/clientpackets/EnterWorld.java |  4 +++-
 .../gameserver/network/clientpackets/EnterWorld.java |  4 +++-
 .../scripts/handlers/itemhandlers/MercTicket.java    |  6 +++++-
 .../gameserver/network/clientpackets/EnterWorld.java | 12 ++++--------
 .../scripts/handlers/itemhandlers/MercTicket.java    |  6 +++++-
 .../gameserver/network/clientpackets/EnterWorld.java |  9 ++++-----
 .../scripts/handlers/itemhandlers/MercTicket.java    |  6 +++++-
 .../gameserver/network/clientpackets/EnterWorld.java |  9 ++++-----
 8 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index ac332e2c02..a068af1745 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -396,7 +396,9 @@ public class EnterWorld implements IClientIncomingPacket
 			final ClanHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(player.getClan());
 			if ((clanHall != null) && !clanHall.getPaid())
 			{
-				player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				sm.addNumber(clanHall.getLease());
+				player.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 8277a11219..10595948fc 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -421,7 +421,9 @@ public class EnterWorld implements IClientIncomingPacket
 			final ClanHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(player.getClan());
 			if ((clanHall != null) && !clanHall.getPaid())
 			{
-				player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				sm.addNumber(clanHall.getLease());
+				player.sendPacket(sm);
 			}
 		}
 		
diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
index 2912552d2a..baf939ac75 100644
--- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
+++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 public class MercTicket implements IItemHandler
 {
@@ -74,6 +75,7 @@ public class MercTicket implements IItemHandler
 			player.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
 			return false;
 		}
+		
 		// Checking the Seal of Strife status
 		switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE))
 		{
@@ -121,7 +123,9 @@ public class MercTicket implements IItemHandler
 		
 		MercTicketManager.getInstance().addTicket(item.getId(), player);
 		player.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
-		player.sendPacket(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
+		sm.addItemName(item.getId());
+		player.sendPacket(sm);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 7da97b328b..17c64d19bb 100644
--- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -237,15 +237,11 @@ public class EnterWorld implements IClientIncomingPacket
 			notifySponsorOrApprentice(player);
 			
 			final AuctionableHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(clan);
-			if (clanHall != null)
+			if ((clanHall != null) && !clanHall.getPaid())
 			{
-				if (!clanHall.getPaid())
-				{
-					// final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
-					// sm.addString(String.format("%1$TH:%1$TM", LocalTime.ofSecondOfDay((System.currentTimeMillis() - clanHall.getPaidUntil()) / 1000)));
-					// player.sendPacket(sm);
-					player.sendPacket(new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW));
-				}
+				final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				sm.addInt(clanHall.getLease());
+				player.sendPacket(sm);
 			}
 			
 			for (Siege siege : SiegeManager.getInstance().getSieges())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
index 2912552d2a..baf939ac75 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 public class MercTicket implements IItemHandler
 {
@@ -74,6 +75,7 @@ public class MercTicket implements IItemHandler
 			player.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
 			return false;
 		}
+		
 		// Checking the Seal of Strife status
 		switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE))
 		{
@@ -121,7 +123,9 @@ public class MercTicket implements IItemHandler
 		
 		MercTicketManager.getInstance().addTicket(item.getId(), player);
 		player.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
-		player.sendPacket(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
+		sm.addItemName(item.getId());
+		player.sendPacket(sm);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 77a79cd8dd..5c55c8c405 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -250,12 +250,11 @@ public class EnterWorld implements IClientIncomingPacket
 			notifySponsorOrApprentice(player);
 			
 			final AuctionableHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(clan);
-			if (clanHall != null)
+			if ((clanHall != null) && !clanHall.getPaid())
 			{
-				if (!clanHall.getPaid())
-				{
-					player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
-				}
+				final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				sm.addInt(clanHall.getLease());
+				player.sendPacket(sm);
 			}
 			
 			for (Siege siege : SiegeManager.getInstance().getSieges())
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
index 2912552d2a..baf939ac75 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/MercTicket.java
@@ -25,6 +25,7 @@ import org.l2jmobius.gameserver.model.item.instance.Item;
 import org.l2jmobius.gameserver.model.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.siege.Castle;
 import org.l2jmobius.gameserver.network.SystemMessageId;
+import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 
 public class MercTicket implements IItemHandler
 {
@@ -74,6 +75,7 @@ public class MercTicket implements IItemHandler
 			player.sendPacket(SystemMessageId.THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE);
 			return false;
 		}
+		
 		// Checking the Seal of Strife status
 		switch (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE))
 		{
@@ -121,7 +123,9 @@ public class MercTicket implements IItemHandler
 		
 		MercTicketManager.getInstance().addTicket(item.getId(), player);
 		player.destroyItem("Consume", item.getObjectId(), 1, null, false); // Remove item from char's inventory
-		player.sendPacket(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
+		final SystemMessage sm = new SystemMessage(SystemMessageId.PLACE_S1_IN_THE_CURRENT_LOCATION_AND_DIRECTION_DO_YOU_WISH_TO_CONTINUE);
+		sm.addItemName(item.getId());
+		player.sendPacket(sm);
 		return true;
 	}
 }
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 37b01ded5b..3bf8b901bc 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -251,12 +251,11 @@ public class EnterWorld implements IClientIncomingPacket
 			notifySponsorOrApprentice(player);
 			
 			final AuctionableHall clanHall = ClanHallTable.getInstance().getClanHallByOwner(clan);
-			if (clanHall != null)
+			if ((clanHall != null) && !clanHall.getPaid())
 			{
-				if (!clanHall.getPaid())
-				{
-					player.sendPacket(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
-				}
+				final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				sm.addInt(clanHall.getLease());
+				player.sendPacket(sm);
 			}
 			
 			for (Siege siege : SiegeManager.getInstance().getSieges())