Browse Source

Removed L2Fisherman instance.

Adry85 7 years ago
parent
commit
2c43c001b6

+ 1 - 9
src/main/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -59,7 +59,6 @@ import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.instance.L2ClanHallManagerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2DoormenInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2FishermanInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TeleporterInstance;
@@ -952,13 +951,6 @@ public class L2Npc extends L2Character
 					return;
 				}
 			}
-			else if (!Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP && (this instanceof L2FishermanInstance))
-			{
-				if (showPkDenyChatWindow(player, "fisherman"))
-				{
-					return;
-				}
-			}
 		}
 		
 		if (getTemplate().isType("L2Auctioneer") && (val == 0))
@@ -1499,7 +1491,7 @@ public class L2Npc extends L2Character
 			{
 				deleteMe();
 			}
-		} , delay);
+		}, delay);
 		return this;
 	}
 	

+ 0 - 114
src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java

@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2004-2018 L2J Server
- * 
- * This file is part of L2J Server.
- * 
- * L2J Server is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J Server is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.model.actor.instance;
-
-import java.util.List;
-
-import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
-import com.l2jserver.gameserver.datatables.SkillData;
-import com.l2jserver.gameserver.enums.InstanceType;
-import com.l2jserver.gameserver.model.L2SkillLearn;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.model.base.AcquireSkillType;
-import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-
-public final class L2FishermanInstance extends L2MerchantInstance
-{
-	/**
-	 * Creates a fisherman.
-	 * @param template the fisherman NPC template
-	 */
-	public L2FishermanInstance(L2NpcTemplate template)
-	{
-		super(template);
-		setInstanceType(InstanceType.L2FishermanInstance);
-	}
-	
-	@Override
-	public String getHtmlPath(int npcId, int val)
-	{
-		String pom = "";
-		
-		if (val == 0)
-		{
-			pom = "" + npcId;
-		}
-		else
-		{
-			pom = npcId + "-" + val;
-		}
-		
-		return "data/html/fisherman/" + pom + ".htm";
-	}
-	
-	@Override
-	public void onBypassFeedback(L2PcInstance player, String command)
-	{
-		if (command.equalsIgnoreCase("FishSkillList"))
-		{
-			showFishSkillList(player);
-		}
-		else
-		{
-			super.onBypassFeedback(player, command);
-		}
-	}
-	
-	public static void showFishSkillList(L2PcInstance player)
-	{
-		final List<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableFishingSkills(player);
-		final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.FISHING);
-		
-		int count = 0;
-		
-		for (L2SkillLearn s : skills)
-		{
-			final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
-			
-			if (sk == null)
-			{
-				continue;
-			}
-			count++;
-			asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 1);
-		}
-		
-		if (count == 0)
-		{
-			final int minlLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getFishingSkillTree());
-			if (minlLevel > 0)
-			{
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
-				sm.addInt(minlLevel);
-				player.sendPacket(sm);
-			}
-			else
-			{
-				player.sendPacket(SystemMessageId.NO_MORE_SKILLS_TO_LEARN);
-			}
-		}
-		else
-		{
-			player.sendPacket(asl);
-		}
-	}
-}

+ 2 - 10
src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.ClanPrivilege;
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2FishermanInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2VillageMasterInstance;
@@ -571,20 +570,13 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 	 */
 	private void showSkillList(L2Npc trainer, L2PcInstance player)
 	{
-		if ((_skillType == AcquireSkillType.TRANSFORM) || (_skillType == AcquireSkillType.SUBCLASS) || (_skillType == AcquireSkillType.TRANSFER))
+		if ((_skillType == AcquireSkillType.TRANSFORM) || (_skillType == AcquireSkillType.SUBCLASS) || (_skillType == AcquireSkillType.TRANSFER) || (_skillType == AcquireSkillType.FISHING))
 		{
 			// Managed in Datapack.
 			return;
 		}
 		
-		if (trainer instanceof L2FishermanInstance)
-		{
-			L2FishermanInstance.showFishSkillList(player);
-		}
-		else
-		{
-			L2NpcInstance.showSkillList(player, trainer, player.getLearningClass());
-		}
+		L2NpcInstance.showSkillList(player, trainer, player.getLearningClass());
 	}
 	
 	/**