lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fishing additions.

Browse Source
This commit is contained in:
MobiusDev
2016-12-18 13:15:11 +00:00
parent 8a9b048719
commit 106fdd6c93
13 changed files with 252 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/Fishing.java
View File

@ -75,6 +75,10 @@ public class Fishing
public boolean isAtValidLocation()
{
// TODO: implement checking direction
// if (calculateBaitLocation() == null)
// {
// return false;
// }
return _player.isInsideZone(ZoneId.FISHING);
}
@ -116,7 +120,7 @@ public class Fishing
private void castLine()
{
if (!Config.ALLOWFISHING && !_player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS))
if (!Config.ALLOW_FISHING && !_player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS))
{
_player.sendMessage("Fishing is disabled.");
_player.sendPacket(ActionFailed.STATIC_PACKET);
@ -196,11 +200,11 @@ public class Fishing
}
_baitLocation = calculateBaitLocation();
if (!isAtValidLocation() || (_baitLocation == null))
if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null))
{
if (isFishing())
{
_player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED);
// _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED);
_player.sendPacket(ActionFailed.STATIC_PACKET);
}
else
@ -362,22 +366,23 @@ public class Fishing
int baitX = (int) (_player.getX() + (cos * distance));
int baitY = (int) (_player.getY() + (sin * distance));
// search for fishing and water zone
// search for fishing zone
L2FishingZone fishingZone = null;
L2WaterZone waterZone = null;
for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY))
for (L2ZoneType zone : ZoneManager.getInstance().getZones(_player))
{
if (zone instanceof L2FishingZone)
{
fishingZone = (L2FishingZone) zone;
break;
}
else if (zone instanceof L2WaterZone)
}
// search for water zone
L2WaterZone waterZone = null;
for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY))
{
if (zone instanceof L2WaterZone)
{
waterZone = (L2WaterZone) zone;
}
if ((fishingZone != null) && (waterZone != null))
{
break;
}
}
@ -385,50 +390,8 @@ public class Fishing
int baitZ = computeBaitZ(_player, baitX, baitY, fishingZone, waterZone);
if (baitZ == Integer.MIN_VALUE)
{
for (distance = distMax; distance >= distMin; --distance)
{
baitX = (int) (_player.getX() + (cos * distance));
baitY = (int) (_player.getY() + (sin * distance));
// search for fishing and water zone again
fishingZone = null;
waterZone = null;
for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY))
{
if (zone instanceof L2FishingZone)
{
fishingZone = (L2FishingZone) zone;
}
else if (zone instanceof L2WaterZone)
{
waterZone = (L2WaterZone) zone;
}
if ((fishingZone != null) && (waterZone != null))
{
break;
}
}
baitZ = computeBaitZ(_player, baitX, baitY, fishingZone, waterZone);
if (baitZ != Integer.MIN_VALUE)
{
break;
}
}
if (baitZ == Integer.MIN_VALUE)
{
if (_player.isGM())
{
baitZ = _player.getZ();
}
else
{
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
return null;
}
}
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
return null;
}
return new Location(baitX, baitY, baitZ);
@ -458,10 +421,10 @@ public class Fishing
// always use water zone, fishing zone high z is high in the air...
final int baitZ = waterZone.getWaterZ();
if (!GeoData.getInstance().canSeeTarget(player.getX(), player.getY(), player.getZ(), baitX, baitY, baitZ))
{
return Integer.MIN_VALUE;
}
// if (!GeoData.getInstance().canSeeTarget(player.getX(), player.getY(), player.getZ(), baitX, baitY, baitZ))
//
// return Integer.MIN_VALUE;
// }
if (GeoData.getInstance().hasGeo(baitX, baitY))
{

1
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@ -214,7 +214,6 @@ public abstract class Inventory extends ItemContainer
else if (item.getItemType() == WeaponType.FISHINGROD)
{
final L2ItemInstance lure = inventory.getPaperdollItem(PAPERDOLL_LHAND);
if (lure != null)
{
inventory.setPaperdollItem(PAPERDOLL_LHAND, null);

4
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2FishingZone.java
View File

@ -44,7 +44,7 @@ public class L2FishingZone extends L2ZoneType
{
if (character.isPlayer())
{
if ((Config.ALLOWFISHING || character.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) && !character.isInsideZone(ZoneId.FISHING))
if ((Config.ALLOW_FISHING || character.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) && !character.isInsideZone(ZoneId.FISHING))
{
final WeakReference<L2PcInstance> weakPlayer = new WeakReference<>(character.getActingPlayer());
ThreadPoolManager.getInstance().executeGeneral(new Runnable()
@ -69,7 +69,7 @@ public class L2FishingZone extends L2ZoneType
player.sendPacket(ExAutoFishAvailable.NO);
}
}
ThreadPoolManager.getInstance().scheduleGeneral(this, 7000);
ThreadPoolManager.getInstance().scheduleGeneral(this, 1500);
}
else
{