diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index bc0d0d6687..d13d161689 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,25 +171,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 1ad8f4c201..f0ecb88563 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 4fc084142f..6c6560f912 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,25 +171,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 1ad8f4c201..f0ecb88563 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 4fc084142f..6c6560f912 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,25 +171,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 1ad8f4c201..f0ecb88563 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 4fc084142f..6c6560f912 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,25 +171,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 1ad8f4c201..f0ecb88563 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 4fc084142f..6c6560f912 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,25 +171,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 1ad8f4c201..f0ecb88563 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index a4f5abf5f5..9e7ada1d55 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -172,25 +171,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 1ad8f4c201..f0ecb88563 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1036,14 +1036,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 3cdf5ed18d..61b1e24f5a 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,25 +135,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 26582c9cd1..5e3dfe8540 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 3cdf5ed18d..61b1e24f5a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,25 +135,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 26582c9cd1..5e3dfe8540 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 3cdf5ed18d..61b1e24f5a 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,25 +135,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 26582c9cd1..5e3dfe8540 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
index 3cdf5ed18d..61b1e24f5a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java
@@ -30,7 +30,6 @@ import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.entity.Hero;
 import com.l2jmobius.gameserver.model.olympiad.CompetitionType;
 import com.l2jmobius.gameserver.model.olympiad.Olympiad;
 import com.l2jmobius.gameserver.model.olympiad.OlympiadGameManager;
@@ -136,25 +135,13 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
 			}
 			case "calculatePoints":
 			{
-				final int points = Olympiad.getInstance().getOlympiadTradePoint(player, false);
-				if (points == 0)
+				if (Olympiad.getInstance().getOlympiadTradePoint(player, false) > 0)
 				{
-					htmltext = "OlyManager-calculateNoEnough.html";
-				}
-				else if (points < 20)
-				{
-					if (Hero.getInstance().isUnclaimedHero(player.getObjectId()) || Hero.getInstance().isHero(player.getObjectId()))
-					{
-						htmltext = "OlyManager-calculateEnough.html";
-					}
-					else
-					{
-						htmltext = "OlyManager-calculateNoEnough.html";
-					}
+					htmltext = "OlyManager-calculateEnough.html";
 				}
 				else
 				{
-					htmltext = "OlyManager-calculateEnough.html";
+					htmltext = "OlyManager-calculateNoEnough.html";
 				}
 				break;
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
index 26582c9cd1..5e3dfe8540 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
@@ -1041,14 +1041,8 @@ public class Olympiad extends ListenersContainer
 			return 0;
 		}
 		
-		int points = 0;
-		
 		// Hero point bonus
-		if (Hero.getInstance().isHero(player.getObjectId()) || Hero.getInstance().isUnclaimedHero(player.getObjectId()))
-		{
-			points += Config.ALT_OLY_HERO_POINTS;
-		}
-		
+		int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
 		// Rank point bonus
 		switch (_noblesRank.get(objId))
 		{