From a897f037b15ac4f19be0ab3e6a618e8c61937700 Mon Sep 17 00:00:00 2001
From: xban1x <urban.lavbic@gmail.com>
Date: Fri, 26 Jul 2013 20:17:53 +0000
Subject: [PATCH] BETA: DP-part for [L6119] * Fix for WalkingManager
warnings. * Tested by: lucan * Reviewed by: Zoey76,
UnAfraid, jurchiks
---
L2J_DataPack_BETA/dist/game/data/Routes.xml | 56 +++++++++----------
.../fantasy_isle/HandysBlockCheckerEvent.java | 2 +-
.../scripts/ai/individual/Venom/Venom.java | 4 +-
.../RainbowSpringsChateau.java | 4 +-
.../conquerablehalls/flagwar/FlagWar.java | 6 +-
.../admincommandhandlers/AdminZone.java | 9 +--
.../handlers/effecthandlers/Escape.java | 2 +-
.../handlers/itemhandlers/EventItem.java | 2 +-
.../scripts/handlers/skillhandlers/Dummy.java | 2 +-
.../handlers/usercommandhandlers/Unstuck.java | 4 +-
10 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/Routes.xml b/L2J_DataPack_BETA/dist/game/data/Routes.xml
index 8d6f878980..47ac886c42 100644
--- a/L2J_DataPack_BETA/dist/game/data/Routes.xml
+++ b/L2J_DataPack_BETA/dist/game/data/Routes.xml
@@ -162,7 +162,7 @@
<target id="22848" spawnX="146247" spawnY="112541" spawnZ="-3725" />
<target id="22848" spawnX="146438" spawnY="112525" spawnZ="-3725" />
<target id="22848" spawnX="146101" spawnY="112812" spawnZ="-3725" />
- <target id="22848" spawnX="148611" spawnY="121436" spawnZ="-4864" />
+ <target id="22848" spawnX="148611" spawnY="121436" spawnZ="-3725" />
<target id="22848" spawnX="147008" spawnY="112896" spawnZ="-3725" />
<target id="22848" spawnX="147259" spawnY="112937" spawnZ="-3725" />
<target id="22849" spawnX="145781" spawnY="112722" spawnZ="-3725" />
@@ -185,12 +185,12 @@
<target id="22850" spawnX="146062" spawnY="112882" spawnZ="-3725" />
<target id="22850" spawnX="146885" spawnY="112672" spawnZ="-3725" />
<target id="22850" spawnX="146741" spawnY="112446" spawnZ="-3725" />
- <target id="22850" spawnX="148504" spawnY="121330" spawnZ="-4848" />
- <target id="22850" spawnX="148553" spawnY="121424" spawnZ="-4864" />
+ <target id="22850" spawnX="148504" spawnY="121330" spawnZ="-3725" />
+ <target id="22850" spawnX="148553" spawnY="121424" spawnZ="-3725" />
<target id="22851" spawnX="146838" spawnY="112955" spawnZ="-3725" />
<target id="22851" spawnX="146439" spawnY="112836" spawnZ="-3725" />
- <target id="22851" spawnX="149111" spawnY="119685" spawnZ="-4864" />
- <target id="22851" spawnX="149155" spawnY="119791" spawnZ="-4864" />
+ <target id="22851" spawnX="149111" spawnY="119685" spawnZ="-3725" />
+ <target id="22851" spawnX="149155" spawnY="119791" spawnZ="-3725" />
<point X="145663" Y="112880" Z="-3725" delay="0" run="true" />
<point X="146119" Y="112677" Z="-3725" delay="0" run="true" />
<point X="146607" Y="112628" Z="-3725" delay="0" run="true" />
@@ -216,36 +216,36 @@
<route name="antharas_layer_path_3" repeat="true" repeatStyle="cycle">
<target id="22848" spawnX="147107" spawnY="112966" spawnZ="-3725" />
<target id="22848" spawnX="146801" spawnY="112863" spawnZ="-3725" />
- <target id="22848" spawnX="149261" spawnY="119685" spawnZ="-4864" />
- <target id="22848" spawnX="151768" spawnY="115130" spawnZ="-5472" />
- <target id="22848" spawnX="152029" spawnY="120592" spawnZ="-3808" />
- <target id="22848" spawnX="152264" spawnY="119512" spawnZ="-3784" />
- <target id="22848" spawnX="152698" spawnY="119086" spawnZ="-3792" />
+ <target id="22848" spawnX="149261" spawnY="119685" spawnZ="-3725" />
+ <target id="22848" spawnX="151768" spawnY="115130" spawnZ="-3725" />
+ <target id="22848" spawnX="152029" spawnY="120592" spawnZ="-3725" />
+ <target id="22848" spawnX="152264" spawnY="119512" spawnZ="-3725" />
+ <target id="22848" spawnX="152698" spawnY="119086" spawnZ="-3725" />
<target id="22849" spawnX="146333" spawnY="112829" spawnZ="-3725" />
<target id="22849" spawnX="147142" spawnY="112831" spawnZ="-3725" />
<target id="22849" spawnX="146824" spawnY="112976" spawnZ="-3727" />
<target id="22849" spawnX="146342" spawnY="112656" spawnZ="-3725" />
<target id="22849" spawnX="147039" spawnY="112903" spawnZ="-3725" />
<target id="22849" spawnX="146205" spawnY="112494" spawnZ="-3725" />
- <target id="22849" spawnX="149287" spawnY="119761" spawnZ="-4864" />
- <target id="22849" spawnX="149331" spawnY="119655" spawnZ="-4864" />
- <target id="22849" spawnX="151692" spawnY="115165" spawnZ="-5472" />
- <target id="22849" spawnX="151918" spawnY="115130" spawnZ="-5464" />
- <target id="22849" spawnX="151959" spawnY="120555" spawnZ="-3808" />
- <target id="22849" spawnX="151980" spawnY="120515" spawnZ="-3808" />
- <target id="22849" spawnX="152024" spawnY="120560" spawnZ="-3808" />
- <target id="22849" spawnX="152264" spawnY="119512" spawnZ="-3784" />
- <target id="22849" spawnX="152698" spawnY="119235" spawnZ="-3784" />
- <target id="22849" spawnX="152760" spawnY="119216" spawnZ="-3784" />
- <target id="22850" spawnX="148659" spawnY="121381" spawnZ="-4864" />
+ <target id="22849" spawnX="149287" spawnY="119761" spawnZ="-3725" />
+ <target id="22849" spawnX="149331" spawnY="119655" spawnZ="-3725" />
+ <target id="22849" spawnX="151692" spawnY="115165" spawnZ="-3725" />
+ <target id="22849" spawnX="151918" spawnY="115130" spawnZ="-3725" />
+ <target id="22849" spawnX="151959" spawnY="120555" spawnZ="-3725" />
+ <target id="22849" spawnX="151980" spawnY="120515" spawnZ="-3725" />
+ <target id="22849" spawnX="152024" spawnY="120560" spawnZ="-3725" />
+ <target id="22849" spawnX="152264" spawnY="119512" spawnZ="-3725" />
+ <target id="22849" spawnX="152698" spawnY="119235" spawnZ="-3725" />
+ <target id="22849" spawnX="152760" spawnY="119216" spawnZ="-3725" />
+ <target id="22850" spawnX="148659" spawnY="121381" spawnZ="-3725" />
<target id="22850" spawnX="146660" spawnY="112757" spawnZ="-3725" />
- <target id="22850" spawnX="152264" spawnY="119512" spawnZ="-3784" />
- <target id="22850" spawnX="152605" spawnY="119152" spawnZ="-3792" />
- <target id="22850" spawnX="152648" spawnY="119046" spawnZ="-3800" />
- <target id="22851" spawnX="151768" spawnY="115279" spawnZ="-5472" />
- <target id="22851" spawnX="151869" spawnY="115209" spawnZ="-5472" />
- <target id="22851" spawnX="152016" spawnY="120566" spawnZ="-3808" />
- <target id="22851" spawnX="152264" spawnY="119512" spawnZ="-3784" />
+ <target id="22850" spawnX="152264" spawnY="119512" spawnZ="-3725" />
+ <target id="22850" spawnX="152605" spawnY="119152" spawnZ="-3725" />
+ <target id="22850" spawnX="152648" spawnY="119046" spawnZ="-3725" />
+ <target id="22851" spawnX="151768" spawnY="115279" spawnZ="-3725" />
+ <target id="22851" spawnX="151869" spawnY="115209" spawnZ="-3725" />
+ <target id="22851" spawnX="152016" spawnY="120566" spawnZ="-3725" />
+ <target id="22851" spawnX="152264" spawnY="119512" spawnZ="-3725" />
<point X="145602" Y="112763" Z="-3725" delay="0" run="true" />
<point X="146136" Y="112555" Z="-3725" delay="0" run="true" />
<point X="146573" Y="112475" Z="-3725" delay="0" run="true" />
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java
index de37a7b578..7f6acfc684 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java
@@ -20,7 +20,7 @@ package ai.fantasy_isle;
import com.l2jserver.Config;
import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
-import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
index a474b249ca..9330c16d9d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Venom/Venom.java
@@ -27,8 +27,8 @@ import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
-import com.l2jserver.gameserver.instancemanager.MapRegionManager;
import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -145,7 +145,7 @@ public final class Venom extends AbstractNpcAI
{
case TELEPORT_CUBE:
{
- talker.teleToLocation(MapRegionManager.TeleportWhereType.Town);
+ talker.teleToLocation(TeleportWhereType.TOWN);
break;
}
case DUNGEON_KEEPER:
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 6836027101..bc248449cc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -41,12 +41,12 @@ import com.l2jserver.gameserver.datatables.NpcTable;
import com.l2jserver.gameserver.datatables.SkillTable;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.instancemanager.CHSiegeManager;
-import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereType;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -195,7 +195,7 @@ public class RainbowSpringsChateau extends Quest
{
if (chr != null)
{
- chr.teleToLocation(TeleportWhereType.Town);
+ chr.teleToLocation(TeleportWhereType.TOWN);
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 9024fa7b48..2b3adf4378 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -35,14 +35,14 @@ import com.l2jserver.gameserver.ai.L2SpecialSiegeGuardAI;
import com.l2jserver.gameserver.cache.HtmCache;
import com.l2jserver.gameserver.datatables.ClanTable;
import com.l2jserver.gameserver.datatables.NpcTable;
-import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereType;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2ClanMember;
import com.l2jserver.gameserver.model.L2SiegeClan;
-import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
@@ -762,7 +762,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
if (pc != null)
{
- pc.teleToLocation(TeleportWhereType.Town);
+ pc.teleToLocation(TeleportWhereType.TOWN);
}
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
index 2667e7471c..a592af9275 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java
@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.L2WorldRegion;
import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.model.zone.ZoneId;
@@ -68,16 +69,16 @@ public class AdminZone implements IAdminCommandHandler
Location loc;
- loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, MapRegionManager.TeleportWhereType.Castle);
+ loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CASTLE);
activeChar.sendMessage("TeleToLocation (Castle): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
- loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, MapRegionManager.TeleportWhereType.ClanHall);
+ loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL);
activeChar.sendMessage("TeleToLocation (ClanHall): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
- loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, MapRegionManager.TeleportWhereType.SiegeFlag);
+ loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG);
activeChar.sendMessage("TeleToLocation (SiegeFlag): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
- loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, MapRegionManager.TeleportWhereType.Town);
+ loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.TOWN);
activeChar.sendMessage("TeleToLocation (Town): x:" + loc.getX() + " y:" + loc.getY() + " z:" + loc.getZ());
}
else if (actualCommand.equalsIgnoreCase("admin_zone_visual"))
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
index 3164ff47c7..b740cef223 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Escape.java
@@ -19,7 +19,7 @@
package handlers.effecthandlers;
import com.l2jserver.gameserver.instancemanager.MapRegionManager;
-import com.l2jserver.gameserver.instancemanager.MapRegionManager.TeleportWhereType;
+import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.effects.EffectTemplate;
import com.l2jserver.gameserver.model.effects.L2Effect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
index 2c212b067c..24de1e3887 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/itemhandlers/EventItem.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
-import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
index 9c9cc947bd..87bf6d6129 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Dummy.java
@@ -20,7 +20,7 @@ package handlers.skillhandlers;
import com.l2jserver.gameserver.handler.ISkillHandler;
import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
-import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.ShotType;
import com.l2jserver.gameserver.model.actor.L2Character;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
index 77c036529e..8692d6acd2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/usercommandhandlers/Unstuck.java
@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.SkillTable;
import com.l2jserver.gameserver.handler.IUserCommandHandler;
-import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.TeleportWhereType;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.TvTEvent;
import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -131,7 +131,7 @@ public class Unstuck implements IUserCommandHandler
_activeChar.enableAllSkills();
_activeChar.setIsCastingNow(false);
_activeChar.setInstanceId(0);
- _activeChar.teleToLocation(MapRegionManager.TeleportWhereType.Town);
+ _activeChar.teleToLocation(TeleportWhereType.TOWN);
}
}
--
GitLab