diff --git a/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 3e4180079d225c72624cf12bb4e9faceb17b9269..25d8528ddc84f5849ecc78c4471967d0041ed40a 100644
--- a/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -18,9 +18,7 @@
  */
 package ai.npc.BlackMarketeerOfMammon;
 
-import java.util.Calendar;
-
-import ai.npc.AbstractNpcAI;
+import java.time.LocalTime;
 
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -29,6 +27,8 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 
+import ai.npc.AbstractNpcAI;
+
 /**
  * Black Marketeer of Mammon - Exchange Adena for AA.
  * @author Adry_85
@@ -100,17 +100,8 @@ public final class BlackMarketeerOfMammon extends AbstractNpcAI
 	
 	private boolean exchangeAvailable()
 	{
-		Calendar currentTime = Calendar.getInstance();
-		Calendar minTime = Calendar.getInstance();
-		minTime.set(Calendar.HOUR_OF_DAY, 20);
-		minTime.set(Calendar.MINUTE, 0);
-		minTime.set(Calendar.SECOND, 0);
-		Calendar maxtTime = Calendar.getInstance();
-		maxtTime.set(Calendar.HOUR_OF_DAY, 23);
-		maxtTime.set(Calendar.MINUTE, 59);
-		maxtTime.set(Calendar.SECOND, 59);
-		
-		return (currentTime.compareTo(minTime) >= 0) && (currentTime.compareTo(maxtTime) <= 0);
+		LocalTime localTime = LocalTime.now();
+		return (localTime.isAfter(LocalTime.parse("20:00:00")) && localTime.isBefore(LocalTime.MAX));
 	}
 	
 	public static void main(String[] args)