BETA: Support for Fishing Rods by '''nonom'''

 * Reeling and Pumping now get a proper damage per rod type.
 * Refactorized a couple of names* and added some javadocs.
 * Rewrited the method getFishingRod() thanks Zoey.
 * Reviewed the damage formula.
 * Improved penalty damage by Expertise skill, now is exactly 5 percent instead a fixed value.

'''REQUIRE: [DP8802].'''

L2J_Server_BETA/java/com/l2jserver/gameserver/GameServer.java

@@ -49,6 +49,7 @@ import com.l2jserver.gameserver.datatables.EnchantItemData;
 import com.l2jserver.gameserver.datatables.EventDroplist;
 import com.l2jserver.gameserver.datatables.ExperienceTable;
 import com.l2jserver.gameserver.datatables.FishData;
+import com.l2jserver.gameserver.datatables.FishingRodsData;
 import com.l2jserver.gameserver.datatables.HelperBuffTable;
 import com.l2jserver.gameserver.datatables.HennaData;
 import com.l2jserver.gameserver.datatables.HerbDropTable;
@@ -228,6 +229,7 @@ public class GameServer
 		RecipeController.getInstance();
 		ArmorSetsData.getInstance();
 		FishData.getInstance();
+		FishingRodsData.getInstance();
 		HennaData.getInstance();
 		
 		printSection("Characters");

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/FishData.java

@@ -24,8 +24,8 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.engines.DocumentParser;
-import com.l2jserver.gameserver.model.L2Fish;
 import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.fishing.L2Fish;
 
 /**
  * This class holds the Fish information.

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/FishingRodsData.java

@@ -0,0 +1,95 @@
+/*
+ * This program 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.
+ * 
+ * This program 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.datatables;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.engines.DocumentParser;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.fishing.L2FishingRod;
+
+/**
+ * This class holds the Fishing Rods information.
+ * @author nonom
+ */
+public final class FishingRodsData extends DocumentParser
+{
+	private static final Map<Integer, L2FishingRod> _fishingRods = new HashMap<>();
+	
+	private FishingRodsData()
+	{
+		_fishingRods.clear();
+		
+		parseDatapackFile("data/stats/items/fishing/fishingRods.xml");
+		_log.info(getClass().getSimpleName() + ": Loaded " + _fishingRods.size() + " Fishing Rods.");
+	}
+	
+	@Override
+	protected void parseDocument(Document doc)
+	{
+		NamedNodeMap attrs;
+		Node att;
+		L2FishingRod fishingRod;
+		StatsSet set;
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling())
+		{
+			if ("list".equalsIgnoreCase(n.getNodeName()))
+			{
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
+				{
+					if ("fishingRod".equalsIgnoreCase(d.getNodeName()))
+					{
+						
+						attrs = d.getAttributes();
+						
+						set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++)
+						{
+							att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						fishingRod = new L2FishingRod(set);
+						_fishingRods.put(fishingRod.getFishingRodItemId(), fishingRod);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @param itemId
+	 * @return A fishing Rod by Item Id
+	 */
+	public L2FishingRod getFishingRod(int itemId)
+	{
+		return _fishingRods.get(itemId);
+	}
+	
+	public static FishingRodsData getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
+	@SuppressWarnings("synthetic-access")
+	private static class SingletonHolder
+	{
+		protected static final FishingRodsData _instance = new FishingRodsData();
+	}
+}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Fish.java

@@ -1,270 +0,0 @@
-/*
- * This program 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.
- * 
- * This program 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;
-
-/**
- * Class for the Fish object.
- * @author nonom
- */
-public class L2Fish implements Cloneable
-{
-	private final int _fishId;
-	private final int _itemId;
-	private final String _itemName;
-	private int _fishGroup;
-	private final int _fishLevel;
-	private final double _fishBiteRate;
-	private final double _fishGuts;
-	private final int _fishHp;
-	private final int _fishMaxLength;
-	private final double _fishLengthRate;
-	private final double _hpRegen;
-	private final int _startCombatTime;
-	private final int _combatDuration;
-	private final int _gutsCheckTime;
-	private final double _gutsCheckProbability;
-	private final double _cheatingProb;
-	private final int _fishGrade;
-	
-	public L2Fish(StatsSet set)
-	{
-		_fishId = set.getInteger("fishId");
-		_itemId = set.getInteger("itemId");
-		_itemName = set.getString("itemName");
-		_fishGroup = getGroupId(set.getString("fishGroup"));
-		_fishLevel = set.getInteger("fishLevel");
-		_fishBiteRate = set.getDouble("fishBiteRate"); // TODO: Support needed.
-		_fishGuts = set.getDouble("fishGuts");
-		_fishHp = set.getInteger("fishHp");
-		_fishMaxLength = set.getInteger("fishMaxLength"); // TODO: Support needed.
-		_fishLengthRate = set.getDouble("fishLengthRate"); // TODO: Support needed.
-		_hpRegen = set.getDouble("hpRegen");
-		_startCombatTime = set.getInteger("startCombatTime");
-		_combatDuration = set.getInteger("combatDuration");
-		_gutsCheckTime = set.getInteger("gutsCheckTime");
-		_gutsCheckProbability = set.getDouble("gutsCheckProbability"); // TODO: Support needed.
-		_cheatingProb = set.getDouble("cheatingProb"); // TODO: Support needed.
-		_fishGrade = getGradeId(set.getString("fishGrade"));
-	}
-	
-	@Override
-	public L2Fish clone()
-	{
-		try
-		{
-			return (L2Fish) super.clone();
-		}
-		catch (CloneNotSupportedException e)
-		{
-			return null;
-		}
-	}
-	
-	/**
-	 * @return the fish Id.
-	 */
-	public int getFishId()
-	{
-		return _fishId;
-	}
-	
-	/**
-	 * @return the fish Item Id.
-	 */
-	public int getItemId()
-	{
-		return _itemId;
-	}
-	
-	/**
-	 * @return the fish Item name Id.
-	 */
-	public String getItemName()
-	{
-		return _itemName;
-	}
-	
-	/**
-	 * @return the fish Group.
-	 */
-	public int getFishGroup()
-	{
-		return _fishGroup;
-	}
-	
-	/**
-	 * @return the fish Level.
-	 */
-	public int getFishLevel()
-	{
-		return _fishLevel;
-	}
-	
-	/**
-	 * @return the fish Bite Rate.
-	 */
-	public double getFishBiteRate()
-	{
-		return _fishBiteRate;
-	}
-	
-	/**
-	 * @return the fish Guts.
-	 */
-	public double getFishGuts()
-	{
-		return _fishGuts;
-	}
-	
-	/**
-	 * @return the fish Hp.
-	 */
-	public int getFishHp()
-	{
-		return _fishHp;
-	}
-	
-	/**
-	 * @return the fish Max length.
-	 */
-	public int getFishMaxLength()
-	{
-		return _fishMaxLength;
-	}
-	
-	/**
-	 * @return the fish Length rate.
-	 */	
-	public double getFishLengthRate()
-	{
-		return _fishLengthRate;
-	}
-	
-	/**
-	 * @return the fish Hp regen.
-	 */
-	public double getHpRegen()
-	{
-		return _hpRegen;
-	}
-	
-	/**
-	 * @return the fish start Combat time.
-	 */
-	public int getStartCombatTime()
-	{
-		return _startCombatTime;
-	}
-	
-	/**
-	 * @return the fish Combat duration.
-	 */
-	public int getCombatDuration()
-	{
-		return _combatDuration;
-	}
-	
-	/**
-	 * @return the fish Guts check time.
-	 */
-	public int getGutsCheckTime()
-	{
-		return _gutsCheckTime;
-	}
-	
-	/**
-	 * @return the fish Guts Check probability.
-	 */
-	public double getGutsCheckProbability()
-	{
-		return _gutsCheckProbability;
-	}
-	
-	/**
-	 * @return the fish Cheating prob.
-	 */
-	public double getCheatingProb()
-	{
-		return _cheatingProb;
-	}
-	
-	/**
-	 * @return the fish Grade.
-	 */
-	public int getFishGrade()
-	{
-		return _fishGrade;
-	}
-	
-	/**
-	 * @param fg the fish Group.
-	 */
-	public void setFishGroup(int fg)
-	{
-		_fishGroup = fg;
-	}
-	
-	/**
-	 * @param name the Group Name.
-	 * @return the fish Group Id.
-	 */
-	private int getGroupId(String name)
-	{
-		switch (name)
-		{
-			case "swift":
-				return 1;
-			case "ugly":
-				return 2;
-			case "fish_box":
-				return 3;
-			case "easy_wide":
-				return 4;
-			case "easy_swift":
-				return 5;
-			case "easy_ugly":
-				return 6;
-			case "hard_wide":
-				return 7;
-			case "hard_swift":
-				return 8;
-			case "hard_ugly":
-				return 9;
-			case "hs_fish":
-				return 10; // FIXME: Verify the ID
-			case "wide":
-			default:
-				return 0;
-		}
-	}
-	
-	/**
-	 * @param name the Grade Name.
-	 * @return the fish Grade Id.
-	 */
-	private int getGradeId(String name)
-	{
-		switch (name)
-		{
-			case "fish_easy":
-				return 0;
-			case "fish_hard":
-				return 2;
-			case "fish_normal":
-			default:
-				return 1;
-		}
-	}
-}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Fishing.java

@@ -1,426 +0,0 @@
-/*
- * This program 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.
- * 
- * This program 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;
-
-import java.util.concurrent.Future;
-
-import com.l2jserver.gameserver.ThreadPoolManager;
-import com.l2jserver.gameserver.datatables.NpcTable;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2PenaltyMonsterInstance;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
-import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.ExFishingHpRegen;
-import com.l2jserver.gameserver.network.serverpackets.ExFishingStartCombat;
-import com.l2jserver.gameserver.network.serverpackets.PlaySound;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.Rnd;
-
-public class L2Fishing implements Runnable
-{
-	private L2PcInstance _fisher;
-	private int _time;
-	private int _stop = 0;
-	private int _goodUse = 0;
-	private int _anim = 0;
-	private int _mode = 0;
-	private int _deceptiveMode = 0;
-	private Future<?> _fishAiTask;
-	private boolean _thinking;
-	// Fish datas
-	private final int _fishId;
-	private final int _fishMaxHp;
-	private int _fishCurHp;
-	private final double _regenHp;
-	private final boolean _isUpperGrade;
-	private int _lureType;
-	
-	@Override
-	public void run()
-	{
-		if (_fisher == null)
-		{
-			return;
-		}
-		
-		if (_fishCurHp >= (_fishMaxHp * 2))
-		{
-			// The fish got away
-			_fisher.sendPacket(SystemMessageId.BAIT_STOLEN_BY_FISH);
-			doDie(false);
-		}
-		else if (_time <= 0)
-		{
-			// Time is up, so that fish got away
-			_fisher.sendPacket(SystemMessageId.FISH_SPIT_THE_HOOK);
-			doDie(false);
-		}
-		else
-		{
-			aiTask();
-		}
-	}
-	
-	public L2Fishing(L2PcInstance Fisher, L2Fish fish, boolean isNoob, boolean isUpperGrade)
-	{
-		_fisher = Fisher;
-		_fishMaxHp = fish.getFishHp();
-		_fishCurHp = _fishMaxHp;
-		_regenHp = fish.getHpRegen();
-		_fishId = fish.getItemId();
-		_time = fish.getCombatDuration();
-		_isUpperGrade = isUpperGrade;
-		if (isUpperGrade)
-		{
-			_deceptiveMode = Rnd.get(100) >= 90 ? 1 : 0;
-			_lureType = 2;
-		}
-		else
-		{
-			_deceptiveMode = 0;
-			_lureType = isNoob ? 0 : 1;
-		}
-		_mode = Rnd.get(100) >= 80 ? 1 : 0;
-		
-		ExFishingStartCombat efsc = new ExFishingStartCombat(_fisher, _time, _fishMaxHp, _mode, _lureType, _deceptiveMode);
-		_fisher.broadcastPacket(efsc);
-		_fisher.sendPacket(new PlaySound(1, "SF_S_01", 0, 0, 0, 0, 0));
-		// Succeeded in getting a bite
-		_fisher.sendPacket(SystemMessageId.GOT_A_BITE);
-		
-		if (_fishAiTask == null)
-		{
-			_fishAiTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(this, 1000, 1000);
-		}
-		
-	}
-	
-	public void changeHp(int hp, int pen)
-	{
-		_fishCurHp -= hp;
-		if (_fishCurHp < 0)
-		{
-			_fishCurHp = 0;
-		}
-		
-		ExFishingHpRegen efhr = new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, _goodUse, _anim, pen, _deceptiveMode);
-		_fisher.broadcastPacket(efhr);
-		_anim = 0;
-		if (_fishCurHp > (_fishMaxHp * 2))
-		{
-			_fishCurHp = _fishMaxHp * 2;
-			doDie(false);
-			return;
-		}
-		else if (_fishCurHp == 0)
-		{
-			doDie(true);
-			return;
-		}
-	}
-	
-	public synchronized void doDie(boolean win)
-	{
-		if (_fishAiTask != null)
-		{
-			_fishAiTask.cancel(false);
-			_fishAiTask = null;
-		}
-		
-		if (_fisher == null)
-		{
-			return;
-		}
-		
-		if (win)
-		{
-			int check = Rnd.get(100);
-			if (check <= 5)
-			{
-				PenaltyMonster();
-			}
-			else
-			{
-				_fisher.sendPacket(SystemMessageId.YOU_CAUGHT_SOMETHING);
-				_fisher.addItem("Fishing", _fishId, 1, null, true);
-			}
-		}
-		_fisher.endFishing(win);
-		_fisher = null;
-	}
-	
-	protected void aiTask()
-	{
-		if (_thinking)
-		{
-			return;
-		}
-		_thinking = true;
-		_time--;
-		
-		try
-		{
-			if (_mode == 1)
-			{
-				if (_deceptiveMode == 0)
-				{
-					_fishCurHp += (int) _regenHp;
-				}
-			}
-			else
-			{
-				if (_deceptiveMode == 1)
-				{
-					_fishCurHp += (int) _regenHp;
-				}
-			}
-			if (_stop == 0)
-			{
-				_stop = 1;
-				int check = Rnd.get(100);
-				if (check >= 70)
-				{
-					_mode = _mode == 0 ? 1 : 0;
-				}
-				if (_isUpperGrade)
-				{
-					check = Rnd.get(100);
-					if (check >= 90)
-					{
-						_deceptiveMode = _deceptiveMode == 0 ? 1 : 0;
-					}
-				}
-			}
-			else
-			{
-				_stop--;
-			}
-		}
-		finally
-		{
-			_thinking = false;
-			ExFishingHpRegen efhr = new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, 0, _anim, 0, _deceptiveMode);
-			if (_anim != 0)
-			{
-				_fisher.broadcastPacket(efhr);
-			}
-			else
-			{
-				_fisher.sendPacket(efhr);
-			}
-		}
-	}
-	
-	public void useRealing(int dmg, int pen)
-	{
-		_anim = 2;
-		if (Rnd.get(100) > 90)
-		{
-			_fisher.sendPacket(SystemMessageId.FISH_RESISTED_ATTEMPT_TO_BRING_IT_IN);
-			_goodUse = 0;
-			changeHp(0, pen);
-			return;
-		}
-		if (_fisher == null)
-		{
-			return;
-		}
-		if (_mode == 1)
-		{
-			if (_deceptiveMode == 0)
-			{
-				// Reeling is successful, Damage: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				if (pen == 50)
-				{
-					sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
-					_fisher.sendPacket(sm);
-				}
-				_goodUse = 1;
-				changeHp(dmg, pen);
-			}
-			else
-			{
-				// Reeling failed, Damage: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				_goodUse = 2;
-				changeHp(-dmg, pen);
-			}
-		}
-		else
-		{
-			if (_deceptiveMode == 0)
-			{
-				// Reeling failed, Damage: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				_goodUse = 2;
-				changeHp(-dmg, pen);
-			}
-			else
-			{
-				// Reeling is successful, Damage: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				if (pen == 50)
-				{
-					sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
-					_fisher.sendPacket(sm);
-				}
-				_goodUse = 1;
-				changeHp(dmg, pen);
-			}
-		}
-	}
-	
-	public void usePomping(int dmg, int pen)
-	{
-		_anim = 1;
-		if (Rnd.get(100) > 90)
-		{
-			_fisher.sendPacket(SystemMessageId.FISH_RESISTED_ATTEMPT_TO_BRING_IT_IN);
-			_goodUse = 0;
-			changeHp(0, pen);
-			return;
-		}
-		if (_fisher == null)
-		{
-			return;
-		}
-		if (_mode == 0)
-		{
-			if (_deceptiveMode == 0)
-			{
-				// Pumping is successful. Damage: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				if (pen == 50)
-				{
-					sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
-					_fisher.sendPacket(sm);
-				}
-				_goodUse = 1;
-				changeHp(dmg, pen);
-			}
-			else
-			{
-				// Pumping failed, Regained: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				_goodUse = 2;
-				changeHp(-dmg, pen);
-			}
-		}
-		else
-		{
-			if (_deceptiveMode == 0)
-			{
-				// Pumping failed, Regained: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				_goodUse = 2;
-				changeHp(-dmg, pen);
-			}
-			else
-			{
-				// Pumping is successful. Damage: $s1
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
-				_fisher.sendPacket(sm);
-				if (pen == 50)
-				{
-					sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
-					_fisher.sendPacket(sm);
-				}
-				_goodUse = 1;
-				changeHp(dmg, pen);
-			}
-		}
-	}
-	
-	private void PenaltyMonster()
-	{
-		int lvl = (int) Math.round(_fisher.getLevel() * 0.1);
-		
-		int npcid;
-		
-		_fisher.sendPacket(SystemMessageId.YOU_CAUGHT_SOMETHING_SMELLY_THROW_IT_BACK);
-		switch (lvl)
-		{
-			case 0:
-			case 1:
-				npcid = 18319;
-				break;
-			case 2:
-				npcid = 18320;
-				break;
-			case 3:
-				npcid = 18321;
-				break;
-			case 4:
-				npcid = 18322;
-				break;
-			case 5:
-				npcid = 18323;
-				break;
-			case 6:
-				npcid = 18324;
-				break;
-			case 7:
-				npcid = 18325;
-				break;
-			case 8:
-			case 9:
-				npcid = 18326;
-				break;
-			default:
-				npcid = 18319;
-				break;
-		}
-		L2NpcTemplate temp;
-		temp = NpcTable.getInstance().getTemplate(npcid);
-		if (temp != null)
-		{
-			try
-			{
-				L2Spawn spawn = new L2Spawn(temp);
-				spawn.setLocx(_fisher.getX());
-				spawn.setLocy(_fisher.getY());
-				spawn.setLocz(_fisher.getZ() + 20);
-				spawn.setAmount(1);
-				spawn.setHeading(_fisher.getHeading());
-				spawn.stopRespawn();
-				((L2PenaltyMonsterInstance) spawn.doSpawn().scheduleDespawn(3 * 60 * 1000)).setPlayerToKill(_fisher);
-			}
-			catch (Exception e)
-			{
-				// Nothing
-			}
-		}
-	}
-}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -101,8 +101,6 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2ContactList;
 import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
-import com.l2jserver.gameserver.model.L2Fish;
-import com.l2jserver.gameserver.model.L2Fishing;
 import com.l2jserver.gameserver.model.L2Macro;
 import com.l2jserver.gameserver.model.L2ManufactureItem;
 import com.l2jserver.gameserver.model.L2ManufactureList;
@@ -162,6 +160,8 @@ import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.entity.L2Event;
 import com.l2jserver.gameserver.model.entity.Siege;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.fishing.L2Fish;
+import com.l2jserver.gameserver.model.fishing.L2Fishing;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
 import com.l2jserver.gameserver.model.itemcontainer.PcFreight;