AddSkillBySkill canPump transform check and send skill list onExit.
Thanks to Liamxroy.
This commit is contained in:
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -41,21 +41,19 @@ public class AddSkillBySkill extends AbstractEffect
|
|||||||
@Override
|
@Override
|
||||||
public boolean canPump(Creature effector, Creature effected, Skill skill)
|
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
|
@Override
|
||||||
public void pump(Creature effected, Skill skill)
|
public void pump(Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
if (effected.isPlayer())
|
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
||||||
{
|
|
||||||
effected.getActingPlayer().addSkill(_addedSkill.getSkill(), false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onExit(Creature effector, Creature effected, Skill skill)
|
public void onExit(Creature effector, Creature effected, Skill skill)
|
||||||
{
|
{
|
||||||
effected.removeSkill(_addedSkill.getSkill(), false);
|
effected.removeSkill(_addedSkill.getSkill(), false);
|
||||||
|
effected.getActingPlayer().sendSkillList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user