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

Removed useless gm check in fishing skill handler.

Browse Source
This commit is contained in:
mobius
2015-01-02 11:34:35 +00:00
parent b6bdcefdfa
commit 45e2a035cd
1 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
trunk/dist/game/data/scripts/handlers/effecthandlers/Fishing.java vendored
View File

@@ -116,25 +116,22 @@ public final class Fishing extends AbstractEffect
return; return;
} }
if (!player.isGM()) if (player.isInBoat())
{ {
if (player.isInBoat()) player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHEN_TRANSFORMED_OR_WHILE_RIDING_AS_A_PASSENGER_OF_A_BOAT_IT_S_AGAINST_THE_RULES);
{ return;
player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHEN_TRANSFORMED_OR_WHILE_RIDING_AS_A_PASSENGER_OF_A_BOAT_IT_S_AGAINST_THE_RULES); }
return;
} if (player.isInCraftMode() || player.isInStoreMode())
{
if (player.isInCraftMode() || player.isInStoreMode()) player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE);
{ return;
player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_USING_A_RECIPE_BOOK_PRIVATE_WORKSHOP_OR_PRIVATE_STORE); }
return;
} if (player.isInsideZone(ZoneId.WATER))
{
if (player.isInsideZone(ZoneId.WATER)) player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_UNDER_WATER);
{ return;
player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_WHILE_UNDER_WATER);
return;
}
} }
// calculate a position in front of the player with a random distance // calculate a position in front of the player with a random distance
@@ -203,15 +200,8 @@ public final class Fishing extends AbstractEffect
if (baitZ == Integer.MIN_VALUE) if (baitZ == Integer.MIN_VALUE)
{ {
if (player.isGM()) player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
{ return;
baitZ = player.getZ();
}
else
{
player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
return;
}
} }
} }