From 494b3444cead5d559922a1f0dce3be00d9d59bcc Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 1 Apr 2018 17:30:28 +0000 Subject: [PATCH] Minor script improvement for Gate of Unlimited Summoning. --- .../Servitors/GateOfUnlimitedSummoning.java | 15 +++++++-------- .../Servitors/GateOfUnlimitedSummoning.java | 15 +++++++-------- .../Servitors/GateOfUnlimitedSummoning.java | 15 +++++++-------- .../Servitors/GateOfUnlimitedSummoning.java | 15 +++++++-------- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index c409d6b041..6949eb70ae 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -55,10 +55,9 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI final L2Character summoner = npc.getSummoner(); if ((summoner != null) && summoner.isPlayer()) { - final L2PcInstance player = summoner.getActingPlayer(); - getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, player); - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); - getTimers().addTimer("END_OF_LIFE", 30000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, null); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); + getTimers().addTimer("END_OF_LIFE", 30000, npc, null); } return super.onSpawn(npc); } @@ -79,7 +78,7 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } } - getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, null); break; } case "SKILL_CAST_DAMAGE": @@ -90,13 +89,13 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); break; } case "END_OF_LIFE": { - getTimers().cancelTimer("SKILL_CAST_SLOW", npc, player); - getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, player); + getTimers().cancelTimer("SKILL_CAST_SLOW", npc, null); + getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, null); npc.deleteMe(); break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 27ae071363..9bf83cc2a0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -60,10 +60,9 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI final L2Character summoner = npc.getSummoner(); if ((summoner != null) && summoner.isPlayer()) { - final L2PcInstance player = summoner.getActingPlayer(); - getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, player); - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); - getTimers().addTimer("END_OF_LIFE", 30000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, null); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); + getTimers().addTimer("END_OF_LIFE", 30000, npc, null); } return super.onSpawn(npc); } @@ -84,7 +83,7 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } } - getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, null); break; } case "SKILL_CAST_DAMAGE": @@ -95,13 +94,13 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); break; } case "END_OF_LIFE": { - getTimers().cancelTimer("SKILL_CAST_SLOW", npc, player); - getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, player); + getTimers().cancelTimer("SKILL_CAST_SLOW", npc, null); + getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, null); npc.deleteMe(); break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 27ae071363..9bf83cc2a0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -60,10 +60,9 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI final L2Character summoner = npc.getSummoner(); if ((summoner != null) && summoner.isPlayer()) { - final L2PcInstance player = summoner.getActingPlayer(); - getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, player); - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); - getTimers().addTimer("END_OF_LIFE", 30000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, null); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); + getTimers().addTimer("END_OF_LIFE", 30000, npc, null); } return super.onSpawn(npc); } @@ -84,7 +83,7 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } } - getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, null); break; } case "SKILL_CAST_DAMAGE": @@ -95,13 +94,13 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); break; } case "END_OF_LIFE": { - getTimers().cancelTimer("SKILL_CAST_SLOW", npc, player); - getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, player); + getTimers().cancelTimer("SKILL_CAST_SLOW", npc, null); + getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, null); npc.deleteMe(); break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java index 27ae071363..9bf83cc2a0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Servitors/GateOfUnlimitedSummoning.java @@ -60,10 +60,9 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI final L2Character summoner = npc.getSummoner(); if ((summoner != null) && summoner.isPlayer()) { - final L2PcInstance player = summoner.getActingPlayer(); - getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, player); - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); - getTimers().addTimer("END_OF_LIFE", 30000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 1000, npc, null); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); + getTimers().addTimer("END_OF_LIFE", 30000, npc, null); } return super.onSpawn(npc); } @@ -84,7 +83,7 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } } - getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, player); + getTimers().addTimer("SKILL_CAST_SLOW", 3000, npc, null); break; } case "SKILL_CAST_DAMAGE": @@ -95,13 +94,13 @@ public final class GateOfUnlimitedSummoning extends AbstractNpcAI npc.doCast(skill); } - getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, player); + getTimers().addTimer("SKILL_CAST_DAMAGE", 2000, npc, null); break; } case "END_OF_LIFE": { - getTimers().cancelTimer("SKILL_CAST_SLOW", npc, player); - getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, player); + getTimers().cancelTimer("SKILL_CAST_SLOW", npc, null); + getTimers().cancelTimer("SKILL_CAST_DAMAGE", npc, null); npc.deleteMe(); break; }