DP-Part of L2J/L2J_Server@f8142137e506c8dbd345ba65eb094a1b7bad4f37

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java

@@ -147,6 +147,12 @@ public class AdminAdmin implements IAdminCommandHandler
 				activeChar.sendMessage("This player has already claimed the hero status.");
 				return false;
 			}
+			
+			if (!Hero.getInstance().isUnclaimedHero(target.getObjectId()))
+			{
+				activeChar.sendMessage("This player cannot claim the hero status.");
+				return false;
+			}
 			Hero.getInstance().claimHero(target);
 		}
 		else if (command.startsWith("admin_diet"))

L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java

@@ -343,7 +343,7 @@ public class OlympiadManagerLink implements IBypassHandler
 						activeChar.sendPacket(new ExHeroList());
 						break;
 					case 5: // Hero Certification
-						if (!Hero.getInstance().isHero(activeChar.getObjectId()))
+						if (Hero.getInstance().isUnclaimedHero(activeChar.getObjectId()))
 						{
 							Hero.getInstance().claimHero(activeChar);
 							reply.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "hero_receive.htm");