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

Changed ExTimedHuntingZoneLeave packet logic.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-05 22:11:46 +00:00
parent 6c601d4d7a
commit 4e086016f3
2 changed files with 34 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneLeave.java
View File

@@ -17,18 +17,11 @@
package org.l2jmobius.gameserver.network.clientpackets.huntingzones; package org.l2jmobius.gameserver.network.clientpackets.huntingzones;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.TimedHuntingZone;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
@@ -36,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
/** /**
* @author Index * @author Mobius
*/ */
public class ExTimedHuntingZoneLeave implements ClientPacket public class ExTimedHuntingZoneLeave implements ClientPacket
{ {
@@ -55,47 +48,30 @@ public class ExTimedHuntingZoneLeave implements ClientPacket
return; return;
} }
TimedHuntingZoneHolder huntingZone = player.getTimedHuntingZone(); final TimedHuntingZoneHolder huntingZone = player.getTimedHuntingZone();
final Location exit = huntingZone != null ? huntingZone.getExitLocation() != null ? huntingZone.getExitLocation() : InstanceManager.getInstance().getInstance(huntingZone.getInstanceId()).getExitLocation(player) : MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.TOWN); if (huntingZone == null)
if (huntingZone != null)
{ {
player.getVariables().set(PlayerVariables.LAST_HUNTING_ZONE_ID, huntingZone.getZoneId()); return;
player.teleToLocation(exit, InstanceManager.getInstance().getInstance(0)); }
startScheduleTask(player, huntingZone);
final Location exitLocation = huntingZone.getExitLocation();
if (exitLocation != null)
{
player.teleToLocation(exitLocation, null);
} }
else else
{ {
huntingZone = TimedHuntingZoneData.getInstance().getHuntingZone(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, -1)); final Instance world = player.getInstanceWorld();
if (huntingZone != null) if (world != null)
{ {
startScheduleTask(player, huntingZone); world.ejectPlayer(player);
} }
else else
{ {
player.sendPacket(new TimedHuntingZoneExit(0)); player.teleToLocation(TeleportWhereType.TOWN);
}
} }
} }
private void startScheduleTask(Player player, TimedHuntingZoneHolder holder) ThreadPool.schedule(() -> player.sendPacket(new TimedHuntingZoneExit(huntingZone.getZoneId())), 3000);
{
ThreadPool.schedule(() -> additionalCheck(player, holder), 2000);
}
private void additionalCheck(Player player, TimedHuntingZoneHolder timedHuntingZoneHolder)
{
final ZoneType currentZone = ZoneManager.getInstance().getZone(timedHuntingZoneHolder.getEnterLocation(), TimedHuntingZone.class);
if (currentZone != null)
{
if (currentZone.isCharacterInZone(player))
{
currentZone.removeCharacter(player);
}
else if (player.isInsideZone(ZoneId.TIMED_HUNTING))
{
player.sendPacket(new TimedHuntingZoneExit(timedHuntingZoneHolder.getZoneId()));
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
}
}
} }
} }

56
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/huntingzones/ExTimedHuntingZoneLeave.java
View File

@@ -17,18 +17,11 @@
package org.l2jmobius.gameserver.network.clientpackets.huntingzones; package org.l2jmobius.gameserver.network.clientpackets.huntingzones;
import org.l2jmobius.commons.threads.ThreadPool; import org.l2jmobius.commons.threads.ThreadPool;
import org.l2jmobius.gameserver.data.xml.TimedHuntingZoneData;
import org.l2jmobius.gameserver.enums.TeleportWhereType; import org.l2jmobius.gameserver.enums.TeleportWhereType;
import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.MapRegionManager;
import org.l2jmobius.gameserver.instancemanager.ZoneManager;
import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Location;
import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder; import org.l2jmobius.gameserver.model.holders.TimedHuntingZoneHolder;
import org.l2jmobius.gameserver.model.variables.PlayerVariables; import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.zone.ZoneId;
import org.l2jmobius.gameserver.model.zone.ZoneType;
import org.l2jmobius.gameserver.model.zone.type.TimedHuntingZone;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.network.clientpackets.ClientPacket; import org.l2jmobius.gameserver.network.clientpackets.ClientPacket;
@@ -36,7 +29,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit; import org.l2jmobius.gameserver.network.serverpackets.huntingzones.TimedHuntingZoneExit;
/** /**
* @author Index * @author Mobius
*/ */
public class ExTimedHuntingZoneLeave implements ClientPacket public class ExTimedHuntingZoneLeave implements ClientPacket
{ {
@@ -55,47 +48,30 @@ public class ExTimedHuntingZoneLeave implements ClientPacket
return; return;
} }
TimedHuntingZoneHolder huntingZone = player.getTimedHuntingZone(); final TimedHuntingZoneHolder huntingZone = player.getTimedHuntingZone();
final Location exit = huntingZone != null ? huntingZone.getExitLocation() != null ? huntingZone.getExitLocation() : InstanceManager.getInstance().getInstance(huntingZone.getInstanceId()).getExitLocation(player) : MapRegionManager.getInstance().getTeleToLocation(player, TeleportWhereType.TOWN); if (huntingZone == null)
if (huntingZone != null)
{ {
player.getVariables().set(PlayerVariables.LAST_HUNTING_ZONE_ID, huntingZone.getZoneId()); return;
player.teleToLocation(exit, InstanceManager.getInstance().getInstance(0)); }
startScheduleTask(player, huntingZone);
final Location exitLocation = huntingZone.getExitLocation();
if (exitLocation != null)
{
player.teleToLocation(exitLocation, null);
} }
else else
{ {
huntingZone = TimedHuntingZoneData.getInstance().getHuntingZone(player.getVariables().getInt(PlayerVariables.LAST_HUNTING_ZONE_ID, -1)); final Instance world = player.getInstanceWorld();
if (huntingZone != null) if (world != null)
{ {
startScheduleTask(player, huntingZone); world.ejectPlayer(player);
} }
else else
{ {
player.sendPacket(new TimedHuntingZoneExit(0)); player.teleToLocation(TeleportWhereType.TOWN);
}
} }
} }
private void startScheduleTask(Player player, TimedHuntingZoneHolder holder) ThreadPool.schedule(() -> player.sendPacket(new TimedHuntingZoneExit(huntingZone.getZoneId())), 3000);
{
ThreadPool.schedule(() -> additionalCheck(player, holder), 2000);
}
private void additionalCheck(Player player, TimedHuntingZoneHolder timedHuntingZoneHolder)
{
final ZoneType currentZone = ZoneManager.getInstance().getZone(timedHuntingZoneHolder.getEnterLocation(), TimedHuntingZone.class);
if (currentZone != null)
{
if (currentZone.isCharacterInZone(player))
{
currentZone.removeCharacter(player);
}
else if (player.isInsideZone(ZoneId.TIMED_HUNTING))
{
player.sendPacket(new TimedHuntingZoneExit(timedHuntingZoneHolder.getZoneId()));
player.setInsideZone(ZoneId.TIMED_HUNTING, false);
}
}
} }
} }