diff --git a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java index 950219ec99..8e433405db 100644 --- a/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/trunk/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java @@ -20,13 +20,17 @@ package com.l2jserver.gameserver.model.actor.instance; import java.util.List; +import com.l2jserver.Config; import com.l2jserver.gameserver.data.xml.impl.SkillTreesData; import com.l2jserver.gameserver.enums.InstanceType; +import com.l2jserver.gameserver.instancemanager.FishingChampionshipManager; import com.l2jserver.gameserver.model.L2SkillLearn; +import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jserver.gameserver.model.base.AcquireSkillType; import com.l2jserver.gameserver.network.SystemMessageId; import com.l2jserver.gameserver.network.serverpackets.ExAcquirableSkillListByClass; +import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; import com.l2jserver.gameserver.network.serverpackets.SystemMessage; public final class L2FishermanInstance extends L2MerchantInstance @@ -65,6 +69,35 @@ public final class L2FishermanInstance extends L2MerchantInstance { showFishSkillList(player); } + else if (command.startsWith("FishingChampionship")) + { + if (Config.ALT_FISH_CHAMPIONSHIP_ENABLED) + { + FishingChampionshipManager.getInstance().showChampScreen(player, this); + } + else + { + sendHtml(player, this, "no_fish_event001.htm"); + } + } + else if (command.startsWith("FishingReward")) + { + if (Config.ALT_FISH_CHAMPIONSHIP_ENABLED) + { + if (FishingChampionshipManager.getInstance().isWinner(player.getName())) + { + FishingChampionshipManager.getInstance().getReward(player); + } + else + { + sendHtml(player, this, "no_fish_event_reward001.htm"); + } + } + else + { + sendHtml(player, this, "no_fish_event001.htm"); + } + } else { super.onBypassFeedback(player, command); @@ -94,4 +127,11 @@ public final class L2FishermanInstance extends L2MerchantInstance player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.FISHING)); } } + + private static void sendHtml(L2PcInstance player, L2Npc npc, String htmlName) + { + final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); + html.setFile(player.getHtmlPrefix(), "data/html/fisherman/championship/" + htmlName); + player.sendPacket(html); + } }