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

AddSkillBySkill canPump transform check and send skill list onExit.

Browse Source 
Thanks to Liamxroy.
This commit is contained in:
MobiusDevelopment 2022-10-15 21:44:10 +00:00
parent ba09d61dc4
commit dbda42233c
24 changed files with 72 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

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

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}

8
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/AddSkillBySkill.java vendored
View File

@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
@Override
public boolean canPump(Creature effector, Creature effected, Skill skill)
{
return effector.isPlayer() && (effector.getSkillLevel(_existingSkillId) == _existingSkillLevel);
return effected.isPlayer() && !effected.isTransformed() && (effected.getSkillLevel(_existingSkillId) == _existingSkillLevel);
}
@Override
public void pump(Creature effected, Skill skill)
{
if (effected.isPlayer())
{
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
}
@Override
public void onExit(Creature effector, Creature effected, Skill skill)
{
effected.removeSkill(_addedSkill.getSkill(), false);
effected.getActingPlayer().sendSkillList();
}
}