From 7161f79ae696c6c9958861a903d887f0dfbd0e2f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 18 Oct 2022 22:12:43 +0000
Subject: [PATCH] Proper ExRaidTeleportInfo display. Contributed by Serenitty.

---
 .../teleports/ExTeleportToRaidPosition.java            |  2 +-
 .../teleports/RequestRaidTeleportInfo.java             |  2 +-
 .../serverpackets/teleports/ExRaidTeleportInfo.java    | 10 +++++++---
 .../teleports/ExTeleportToRaidPosition.java            |  2 +-
 .../teleports/RequestRaidTeleportInfo.java             |  2 +-
 .../serverpackets/teleports/ExRaidTeleportInfo.java    | 10 +++++++---
 .../teleports/ExTeleportToRaidPosition.java            |  2 +-
 .../teleports/RequestRaidTeleportInfo.java             |  2 +-
 .../serverpackets/teleports/ExRaidTeleportInfo.java    | 10 +++++++---
 9 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index 3f32dc9003..b57395d18d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -146,6 +146,6 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
 		
 		player.setTeleportLocation(location);
 		player.doCast(CommonSkill.TELEPORT.getSkill());
-		player.sendPacket(new ExRaidTeleportInfo());
+		player.sendPacket(new ExRaidTeleportInfo(player));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
index 0b6a14eaeb..bbd52aa6c0 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
@@ -42,6 +42,6 @@ public class RequestRaidTeleportInfo implements IClientIncomingPacket
 			return;
 		}
 		
-		player.sendPacket(new ExRaidTeleportInfo());
+		player.sendPacket(new ExRaidTeleportInfo(player));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
index 8e1e13d9a6..94f8db188d 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
@@ -17,23 +17,27 @@
 package org.l2jmobius.gameserver.network.serverpackets.teleports;
 
 import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author GustavoFonseca
+ * @author Serenitty
  */
 public class ExRaidTeleportInfo implements IClientOutgoingPacket
 {
-	public ExRaidTeleportInfo()
+	private final Player _player;
+	
+	public ExRaidTeleportInfo(Player player)
 	{
+		_player = player;
 	}
 	
 	@Override
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_RAID_TELEPORT_INFO.writeId(packet);
-		packet.writeD(1); // TODO: Character free teleport points from database or configuration.
+		packet.writeD((System.currentTimeMillis() - _player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) < 86400000 ? 1 : 0);
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index 3f32dc9003..b57395d18d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -146,6 +146,6 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
 		
 		player.setTeleportLocation(location);
 		player.doCast(CommonSkill.TELEPORT.getSkill());
-		player.sendPacket(new ExRaidTeleportInfo());
+		player.sendPacket(new ExRaidTeleportInfo(player));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
index 0b6a14eaeb..bbd52aa6c0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
@@ -42,6 +42,6 @@ public class RequestRaidTeleportInfo implements IClientIncomingPacket
 			return;
 		}
 		
-		player.sendPacket(new ExRaidTeleportInfo());
+		player.sendPacket(new ExRaidTeleportInfo(player));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
index 8e1e13d9a6..94f8db188d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
@@ -17,23 +17,27 @@
 package org.l2jmobius.gameserver.network.serverpackets.teleports;
 
 import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author GustavoFonseca
+ * @author Serenitty
  */
 public class ExRaidTeleportInfo implements IClientOutgoingPacket
 {
-	public ExRaidTeleportInfo()
+	private final Player _player;
+	
+	public ExRaidTeleportInfo(Player player)
 	{
+		_player = player;
 	}
 	
 	@Override
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_RAID_TELEPORT_INFO.writeId(packet);
-		packet.writeD(1); // TODO: Character free teleport points from database or configuration.
+		packet.writeD((System.currentTimeMillis() - _player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) < 86400000 ? 1 : 0);
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
index 3f32dc9003..b57395d18d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/ExTeleportToRaidPosition.java
@@ -146,6 +146,6 @@ public class ExTeleportToRaidPosition implements IClientIncomingPacket
 		
 		player.setTeleportLocation(location);
 		player.doCast(CommonSkill.TELEPORT.getSkill());
-		player.sendPacket(new ExRaidTeleportInfo());
+		player.sendPacket(new ExRaidTeleportInfo(player));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
index 0b6a14eaeb..bbd52aa6c0 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/teleports/RequestRaidTeleportInfo.java
@@ -42,6 +42,6 @@ public class RequestRaidTeleportInfo implements IClientIncomingPacket
 			return;
 		}
 		
-		player.sendPacket(new ExRaidTeleportInfo());
+		player.sendPacket(new ExRaidTeleportInfo(player));
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
index 8e1e13d9a6..94f8db188d 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/teleports/ExRaidTeleportInfo.java
@@ -17,23 +17,27 @@
 package org.l2jmobius.gameserver.network.serverpackets.teleports;
 
 import org.l2jmobius.commons.network.PacketWriter;
+import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author GustavoFonseca
+ * @author Serenitty
  */
 public class ExRaidTeleportInfo implements IClientOutgoingPacket
 {
-	public ExRaidTeleportInfo()
+	private final Player _player;
+	
+	public ExRaidTeleportInfo(Player player)
 	{
+		_player = player;
 	}
 	
 	@Override
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_RAID_TELEPORT_INFO.writeId(packet);
-		packet.writeD(1); // TODO: Character free teleport points from database or configuration.
+		packet.writeD((System.currentTimeMillis() - _player.getVariables().getLong("LastFreeRaidTeleportTime", 0)) < 86400000 ? 1 : 0);
 		return true;
 	}
 }
\ No newline at end of file