From 97230becacd51e019f901d644907d24a34deeb3e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 25 Oct 2019 14:06:00 +0000
Subject: [PATCH] Minor King Petram AI adjustments.
---
.../game/data/instances/ResidenceOfKingPetram.xml | 5 +++++
.../ResidenceOfKingPetram/ResidenceOfKingPetram.java | 12 ++++--------
.../game/data/instances/ResidenceOfKingPetram.xml | 5 +++++
.../ResidenceOfKingPetram/ResidenceOfKingPetram.java | 12 ++++--------
.../game/data/instances/ResidenceOfKingPetram.xml | 5 +++++
.../ResidenceOfKingPetram/ResidenceOfKingPetram.java | 12 ++++--------
6 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/instances/ResidenceOfKingPetram.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/instances/ResidenceOfKingPetram.xml
index bd2fd39fed..ded171fa5b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/instances/ResidenceOfKingPetram.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/instances/ResidenceOfKingPetram.xml
@@ -28,4 +28,9 @@
+
+
+
+
+
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
index 10b689adf3..5ae118457f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
@@ -59,7 +59,6 @@ public class ResidenceOfKingPetram extends AbstractInstance
addStartNpc(TRITAN);
addKillId(PETRAM, PETRAM_PIECE, PETRAM_FRAGMENT);
addAttackId(PETRAM);
- addSpawnId(PETRAM);
addInstanceLeaveId(TEMPLATE_ID);
}
@@ -71,7 +70,10 @@ public class ResidenceOfKingPetram extends AbstractInstance
case "ENTER":
{
enterInstance(player, npc, TEMPLATE_ID);
- _petram = (RaidBossInstance) addSpawn(PETRAM, 222063, 191514, -15486, 50142, false, 0, true, player.getInstanceId());
+ if (player.getInstanceWorld() != null)
+ {
+ _petram = (RaidBossInstance) player.getInstanceWorld().getNpc(PETRAM);
+ }
break;
}
case "SPAWN_MINION":
@@ -123,12 +125,6 @@ public class ResidenceOfKingPetram extends AbstractInstance
return null;
}
- @Override
- public String onSpawn(Npc npc)
- {
- return super.onSpawn(npc);
- }
-
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon, Skill skill)
{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/instances/ResidenceOfKingPetram.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/instances/ResidenceOfKingPetram.xml
index bd2fd39fed..ded171fa5b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/instances/ResidenceOfKingPetram.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/instances/ResidenceOfKingPetram.xml
@@ -28,4 +28,9 @@
+
+
+
+
+
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
index 10b689adf3..5ae118457f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
@@ -59,7 +59,6 @@ public class ResidenceOfKingPetram extends AbstractInstance
addStartNpc(TRITAN);
addKillId(PETRAM, PETRAM_PIECE, PETRAM_FRAGMENT);
addAttackId(PETRAM);
- addSpawnId(PETRAM);
addInstanceLeaveId(TEMPLATE_ID);
}
@@ -71,7 +70,10 @@ public class ResidenceOfKingPetram extends AbstractInstance
case "ENTER":
{
enterInstance(player, npc, TEMPLATE_ID);
- _petram = (RaidBossInstance) addSpawn(PETRAM, 222063, 191514, -15486, 50142, false, 0, true, player.getInstanceId());
+ if (player.getInstanceWorld() != null)
+ {
+ _petram = (RaidBossInstance) player.getInstanceWorld().getNpc(PETRAM);
+ }
break;
}
case "SPAWN_MINION":
@@ -123,12 +125,6 @@ public class ResidenceOfKingPetram extends AbstractInstance
return null;
}
- @Override
- public String onSpawn(Npc npc)
- {
- return super.onSpawn(npc);
- }
-
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon, Skill skill)
{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/instances/ResidenceOfKingPetram.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/instances/ResidenceOfKingPetram.xml
index bd2fd39fed..ded171fa5b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/instances/ResidenceOfKingPetram.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/instances/ResidenceOfKingPetram.xml
@@ -28,4 +28,9 @@
+
+
+
+
+
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
index 10b689adf3..5ae118457f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/instances/ResidenceOfKingPetram/ResidenceOfKingPetram.java
@@ -59,7 +59,6 @@ public class ResidenceOfKingPetram extends AbstractInstance
addStartNpc(TRITAN);
addKillId(PETRAM, PETRAM_PIECE, PETRAM_FRAGMENT);
addAttackId(PETRAM);
- addSpawnId(PETRAM);
addInstanceLeaveId(TEMPLATE_ID);
}
@@ -71,7 +70,10 @@ public class ResidenceOfKingPetram extends AbstractInstance
case "ENTER":
{
enterInstance(player, npc, TEMPLATE_ID);
- _petram = (RaidBossInstance) addSpawn(PETRAM, 222063, 191514, -15486, 50142, false, 0, true, player.getInstanceId());
+ if (player.getInstanceWorld() != null)
+ {
+ _petram = (RaidBossInstance) player.getInstanceWorld().getNpc(PETRAM);
+ }
break;
}
case "SPAWN_MINION":
@@ -123,12 +125,6 @@ public class ResidenceOfKingPetram extends AbstractInstance
return null;
}
- @Override
- public String onSpawn(Npc npc)
- {
- return super.onSpawn(npc);
- }
-
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon, Skill skill)
{