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

Fixed Sweeper skill.

Browse Source
This commit is contained in:
MobiusDev
2016-06-18 12:55:12 +00:00
parent 7d95526268
commit f89f1f20f1
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/handlers/targethandlers/FortressFlagpole.java vendored
View File

@@ -64,7 +64,9 @@ public class FortressFlagpole implements ITargetTypeHandler
case 36285:
case 36316:
case 36354:
{
return target;
}
}
}

1
trunk/dist/game/data/scripts/handlers/targethandlers/Item.java vendored
View File

@@ -39,5 +39,4 @@ public class Item implements ITargetTypeHandler
{
return null;
}
}

5
trunk/dist/game/data/scripts/handlers/targethandlers/NpcBody.java vendored
View File

@@ -20,7 +20,6 @@ import com.l2jmobius.gameserver.GeoData;
import com.l2jmobius.gameserver.handler.ITargetTypeHandler;
import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Playable;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.targets.TargetType;
import com.l2jmobius.gameserver.network.SystemMessageId;
@@ -61,7 +60,7 @@ public class NpcBody implements ITargetTypeHandler
return null;
}
final L2Playable target = (L2Playable) selectedTarget;
final L2Character target = (L2Character) selectedTarget;
if (target.isDead())
{
@@ -90,7 +89,7 @@ public class NpcBody implements ITargetTypeHandler
return null;
}
return target;
return selectedTarget;
}
// If target is not dead or not player/pet it will not even bother to walk within range, unlike Enemy target type.

1
trunk/dist/game/data/scripts/handlers/targethandlers/Others.java vendored
View File

@@ -39,5 +39,4 @@ public class Others implements ITargetTypeHandler
{
return null;
}
}

1
trunk/dist/game/data/scripts/handlers/targethandlers/Self.java vendored
View File

@@ -50,5 +50,4 @@ public class Self implements ITargetTypeHandler
}
return activeChar;
}
}

1
trunk/dist/game/data/scripts/handlers/targethandlers/WyvernTarget.java vendored
View File

@@ -39,5 +39,4 @@ public class WyvernTarget implements ITargetTypeHandler
{
return null;
}
}

1
trunk/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java
View File

@@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
*/
public enum CommonSkill
{
SWEEPER(42, 1),
RAID_CURSE(4215, 1),
RAID_CURSE2(4515, 1),
SEAL_OF_RULER(246, 1),

9
trunk/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@@ -206,7 +206,6 @@ public class SkillCaster implements Runnable
// Stop casting if there is no next phase.
stopCasting(false);
}
}
public boolean startCasting()
@@ -545,8 +544,12 @@ public class SkillCaster implements Runnable
}
else if (obj.isMonster() || (obj.isPlayable() && ((obj.getActingPlayer().getPvpFlag() > 0) || (obj.getActingPlayer().getReputation() < 0))))
{
// Supporting players or monsters result in pvpflag.
player.updatePvPStatus();
// Supporting players or monsters result in pvpflag,
// but Sweeper is excluded.
if (obj.isMonster() && (skill.getId() != CommonSkill.SWEEPER.getId()))
{
player.updatePvPStatus();
}
}
}