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

Fixed not been able to attack doors.

Browse Source
This commit is contained in:
MobiusDev
2018-09-02 23:20:49 +00:00
parent 8cbb988bea
commit 118ca0d877
16 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -582,6 +582,12 @@ public final class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -64,12 +64,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_name = set.getString("name"); _name = set.getString("name");
// position // position
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = set.getInt("z");
_height = set.getInt("height", 150); _height = set.getInt("height", 150);
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
_nodeY = new int[4]; // 4 * y _nodeY = new int[4]; // 4 * y
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -77,6 +73,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = set.getInt("nodeX_" + i); _nodeX[i] = set.getInt("nodeX_" + i);
_nodeY[i] = set.getInt("nodeY_" + i); _nodeY[i] = set.getInt("nodeY_" + i);
} }
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = Math.min(set.getInt("z"), _nodeZ);
// optional // optional
_emmiter = set.getInt("emmiterId", 0); _emmiter = set.getInt("emmiterId", 0);

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -582,6 +582,12 @@ public final class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -64,12 +64,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_name = set.getString("name"); _name = set.getString("name");
// position // position
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = set.getInt("z");
_height = set.getInt("height", 150); _height = set.getInt("height", 150);
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
_nodeY = new int[4]; // 4 * y _nodeY = new int[4]; // 4 * y
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -77,6 +73,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = set.getInt("nodeX_" + i); _nodeX[i] = set.getInt("nodeX_" + i);
_nodeY[i] = set.getInt("nodeY_" + i); _nodeY[i] = set.getInt("nodeY_" + i);
} }
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = Math.min(set.getInt("z"), _nodeZ);
// optional // optional
_emmiter = set.getInt("emmiterId", 0); _emmiter = set.getInt("emmiterId", 0);

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -582,6 +582,12 @@ public final class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -64,12 +64,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_name = set.getString("name"); _name = set.getString("name");
// position // position
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = set.getInt("z");
_height = set.getInt("height", 150); _height = set.getInt("height", 150);
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
_nodeY = new int[4]; // 4 * y _nodeY = new int[4]; // 4 * y
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -77,6 +73,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = set.getInt("nodeX_" + i); _nodeX[i] = set.getInt("nodeX_" + i);
_nodeY[i] = set.getInt("nodeY_" + i); _nodeY[i] = set.getInt("nodeY_" + i);
} }
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = Math.min(set.getInt("z"), _nodeZ);
// optional // optional
_emmiter = set.getInt("emmiterId", 0); _emmiter = set.getInt("emmiterId", 0);

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -582,6 +582,12 @@ public final class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -64,12 +64,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_name = set.getString("name"); _name = set.getString("name");
// position // position
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = set.getInt("z");
_height = set.getInt("height", 150); _height = set.getInt("height", 150);
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
_nodeY = new int[4]; // 4 * y _nodeY = new int[4]; // 4 * y
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -77,6 +73,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = set.getInt("nodeX_" + i); _nodeX[i] = set.getInt("nodeX_" + i);
_nodeY[i] = set.getInt("nodeY_" + i); _nodeY[i] = set.getInt("nodeY_" + i);
} }
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = Math.min(set.getInt("z"), _nodeZ);
// optional // optional
_emmiter = set.getInt("emmiterId", 0); _emmiter = set.getInt("emmiterId", 0);

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -635,6 +635,12 @@ public class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -65,9 +65,6 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
// position // position
final String[] pos = set.getString("pos").split(";"); final String[] pos = set.getString("pos").split(";");
_posX = Integer.parseInt(pos[0]);
_posY = Integer.parseInt(pos[1]);
_posZ = Integer.parseInt(pos[2]);
_height = set.getInt("height"); _height = set.getInt("height");
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
@@ -78,6 +75,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = Integer.parseInt(split[0]); _nodeX[i] = Integer.parseInt(split[0]);
_nodeY[i] = Integer.parseInt(split[1]); _nodeY[i] = Integer.parseInt(split[1]);
} }
_posX = Integer.parseInt(pos[0]);
_posY = Integer.parseInt(pos[1]);
_posZ = Math.min(Integer.parseInt(pos[2]), _nodeZ);
// optional // optional
_emmiter = set.getInt("emitter_id", 0); _emmiter = set.getInt("emitter_id", 0);

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -582,6 +582,12 @@ public final class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -64,12 +64,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_name = set.getString("name"); _name = set.getString("name");
// position // position
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = set.getInt("z");
_height = set.getInt("height", 150); _height = set.getInt("height", 150);
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
_nodeY = new int[4]; // 4 * y _nodeY = new int[4]; // 4 * y
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -77,6 +73,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = set.getInt("nodeX_" + i); _nodeX[i] = set.getInt("nodeX_" + i);
_nodeY[i] = set.getInt("nodeY_" + i); _nodeY[i] = set.getInt("nodeY_" + i);
} }
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = Math.min(set.getInt("z"), _nodeZ);
// optional // optional
_emmiter = set.getInt("emmiterId", 0); _emmiter = set.getInt("emmiterId", 0);

6
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -582,6 +582,12 @@ public final class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

7
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -64,12 +64,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_name = set.getString("name"); _name = set.getString("name");
// position // position
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = set.getInt("z");
_height = set.getInt("height", 150); _height = set.getInt("height", 150);
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
_nodeY = new int[4]; // 4 * y _nodeY = new int[4]; // 4 * y
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -77,6 +73,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = set.getInt("nodeX_" + i); _nodeX[i] = set.getInt("nodeX_" + i);
_nodeY[i] = set.getInt("nodeY_" + i); _nodeY[i] = set.getInt("nodeY_" + i);
} }
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = Math.min(set.getInt("z"), _nodeZ);
// optional // optional
_emmiter = set.getInt("emmiterId", 0); _emmiter = set.getInt("emmiterId", 0);

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2DoorInstance.java
View File

@@ -582,6 +582,12 @@ public final class L2DoorInstance extends L2Character
{ {
broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_CASTLE_GATE_HAS_BEEN_DESTROYED)); 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; return true;
} }

7
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/templates/L2DoorTemplate.java
View File

@@ -64,12 +64,8 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_name = set.getString("name"); _name = set.getString("name");
// position // position
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = set.getInt("z");
_height = set.getInt("height", 150); _height = set.getInt("height", 150);
_nodeZ = set.getInt("nodeZ"); _nodeZ = set.getInt("nodeZ");
_nodeX = new int[4]; // 4 * x _nodeX = new int[4]; // 4 * x
_nodeY = new int[4]; // 4 * y _nodeY = new int[4]; // 4 * y
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
@@ -77,6 +73,9 @@ public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable
_nodeX[i] = set.getInt("nodeX_" + i); _nodeX[i] = set.getInt("nodeX_" + i);
_nodeY[i] = set.getInt("nodeY_" + i); _nodeY[i] = set.getInt("nodeY_" + i);
} }
_posX = set.getInt("x");
_posY = set.getInt("y");
_posZ = Math.min(set.getInt("z"), _nodeZ);
// optional // optional
_emmiter = set.getInt("emmiterId", 0); _emmiter = set.getInt("emmiterId", 0);