From 850c075c0e6a73fb1d74b7ef49217b5005296523 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 15 Sep 2018 15:18:30 +0000
Subject: [PATCH] Adjustments for Tiat doors.
---
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/Doors.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 5 ---
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
.../dist/game/data/DoorData.xml | 42 +++++++++----------
.../model/actor/instance/L2DoorInstance.java | 7 ++--
22 files changed, 261 insertions(+), 276 deletions(-)
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/DoorData.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/DoorData.xml
index 3de266557b..608042ed62 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/DoorData.xml b/L2J_Mobius_2.5_Underground/dist/game/data/DoorData.xml
index b774420d3b..02a4cce092 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/DoorData.xml b/L2J_Mobius_3.0_Helios/dist/game/data/DoorData.xml
index 745d4f4b20..3078ef429f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/DoorData.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/DoorData.xml
index 745d4f4b20..3078ef429f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/DoorData.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/DoorData.xml
index 745d4f4b20..3078ef429f 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/DoorData.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/DoorData.xml
index 745d4f4b20..3078ef429f 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/Doors.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/Doors.xml
index 3f4b81b35f..755a929d6a 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/Doors.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/Doors.xml
@@ -4,32 +4,32 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index 25b3afc958..87a26404aa 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -636,11 +636,6 @@ public class L2DoorInstance extends L2Character
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
- {
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
- }
return true;
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/DoorData.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/DoorData.xml
index ee8f718d0c..db14462189 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/DoorData.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/DoorData.xml
index ee8f718d0c..db14462189 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/DoorData.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/DoorData.xml
index ee8f718d0c..db14462189 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/DoorData.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/DoorData.xml
index ee8f718d0c..db14462189 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/DoorData.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/DoorData.xml
@@ -57,7 +57,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
@@ -93,7 +93,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -165,7 +165,7 @@
-
+
@@ -177,7 +177,7 @@
-
+
@@ -189,7 +189,7 @@
-
+
@@ -201,7 +201,7 @@
-
+
@@ -213,7 +213,7 @@
-
+
@@ -249,7 +249,7 @@
-
+
@@ -261,7 +261,7 @@
-
+
@@ -273,7 +273,7 @@
-
+
@@ -285,7 +285,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -309,7 +309,7 @@
-
+
@@ -333,7 +333,7 @@
-
+
@@ -345,7 +345,7 @@
-
+
@@ -357,7 +357,7 @@
-
+
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
index d7ab3f1c34..7e697b1bb5 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
@@ -582,12 +582,11 @@ public final class L2DoorInstance extends L2Character
{
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED));
}
-
- // Correct position in case pathfinding moved player to a restricted location, since door coordinates can be behind objects.
- if (killer.isPlayer())
+ else
{
- killer.setLocation(killer.getActingPlayer().getLastServerPosition());
+ openMe();
}
+
return true;
}