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

Check summon shared skills on Summon effect spawn.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-10-09 21:50:47 +00:00
parent 0541901d11
commit e46fbd724f
24 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}

3
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/Summon.java vendored
View File

@@ -82,6 +82,7 @@ public class Summon extends AbstractEffect
{
player.getServitors().values().forEach(s -> s.unSummon(player));
}
final NpcTemplate template = NpcData.getInstance().getTemplate(_npcId);
final Servitor summon = new Servitor(template, player);
final int consumeItemInterval = (_consumeItemInterval > 0 ? _consumeItemInterval : (template.getRace() != Race.SIEGE_WEAPON ? 240 : 60)) * 1000;
@@ -108,7 +109,7 @@ public class Summon extends AbstractEffect
for (BuffInfo effect : player.getEffectList().getEffects())
{
final Skill sk = effect.getSkill();
if (!sk.isBad() && !sk.isTransformation())
if (!sk.isBad() && !sk.isTransformation() && skill.isSharedWithSummon())
{
sk.applyEffects(player, summon, false, effect.getTime());
}