From 5fbcd4195965e868f37749055d9c2722e7dddf02 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 17 May 2015 16:51:46 +0000
Subject: [PATCH] Moving fishing level check from zone to effect.

---
 .../handlers/effecthandlers/Fishing.java      |  6 +++
 .../model/zone/type/L2FishingZone.java        | 50 ++++++++-----------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java
index 81773603a7..4dccc9a7b7 100644
--- a/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java
+++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java
@@ -134,6 +134,12 @@ public final class Fishing extends AbstractEffect
 			return;
 		}
 		
+		if (player.getLevel() < 85)
+		{
+			player.sendMessage("You must be level 85 or higher to fish.");
+			return;
+		}
+		
 		// calculate a position in front of the player with a random distance
 		int distance = Rnd.get(MIN_BAIT_DISTANCE, MAX_BAIT_DISTANCE);
 		final double angle = Util.convertHeadingToDegree(player.getHeading());
diff --git a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
index 2b96075098..1e9d7f1daa 100644
--- a/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
+++ b/trunk/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
@@ -33,7 +33,6 @@ import com.l2jserver.gameserver.model.items.type.EtcItemType;
 import com.l2jserver.gameserver.model.items.type.WeaponType;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
-import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.ExAutoFishAvailable;
 
 /**
@@ -63,8 +62,10 @@ public class L2FishingZone extends L2ZoneType
 		if (character.isPlayer() && !Config.SERVER_CLASSIC_SUPPORT)
 		{
 			final L2PcInstance plr = (L2PcInstance) character;
-			stopTask(plr);
-			_task.put(plr.getObjectId(), ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FishReq(plr), 100, 7000));
+			if (!_task.containsKey(plr.getObjectId()))
+			{
+				_task.put(plr.getObjectId(), ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FishReq(plr), 100, 2000));
+			}
 		}
 	}
 	
@@ -123,34 +124,25 @@ public class L2FishingZone extends L2ZoneType
 		{
 			if (Config.ALLOWFISHING && !player.isFishing() && !player.isInsideZone(ZoneId.WATER) && !player.isInBoat() && !player.isInCraftMode() && !player.isInStoreMode() && !player.isTransformed())
 			{
+				// check for equiped fishing rod
+				final L2Weapon equipedWeapon = player.getActiveWeaponItem();
+				
+				if (((equipedWeapon == null) || (equipedWeapon.getItemType() != WeaponType.FISHINGROD)))
 				{
-					if (player.getLevel() < 85)
-					{
-						player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED);
-						player.sendMessage("You must be level 85 or higher to fish.");
-						return;
-					}
-					
-					// check for equiped fishing rod
-					final L2Weapon equipedWeapon = player.getActiveWeaponItem();
-					
-					if (((equipedWeapon == null) || (equipedWeapon.getItemType() != WeaponType.FISHINGROD)))
-					{
-						player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_FISHING_POLE_EQUIPPED);
-						stopTask(player);
-					}
-					
-					// check for equiped lure
-					final L2ItemInstance equipedLeftHand = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
-					
-					if ((equipedLeftHand == null) || (equipedLeftHand.getItemType() != EtcItemType.LURE))
-					{
-						player.sendPacket(SystemMessageId.YOU_MUST_PUT_BAIT_ON_YOUR_HOOK_BEFORE_YOU_CAN_FISH);
-						stopTask(player);
-					}
-					
-					player.sendPacket(new ExAutoFishAvailable(player));
+					stopTask(player);
+					return;
 				}
+				
+				// check for equiped lure
+				final L2ItemInstance equipedLeftHand = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+				
+				if ((equipedLeftHand == null) || (equipedLeftHand.getItemType() != EtcItemType.LURE))
+				{
+					stopTask(player);
+					return;
+				}
+				
+				player.sendPacket(new ExAutoFishAvailable(player));
 			}
 		}
 	}