Advertisement
Guest User

Untitled

a guest
Jun 25th, 2017
56
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 1.38 KB | None | 0 0
  1. Index: java/com/l2jserver/gameserver/model/L2Skill.java
  2. ===================================================================
  3. --- java/com/l2jserver/gameserver/model/L2Skill.java    (revision 5910)
  4. +++ java/com/l2jserver/gameserver/model/L2Skill.java    (working copy)
  5. @@ -2357,9 +2357,9 @@
  6.             return false;
  7.        
  8.         final L2PcInstance player = caster.getActingPlayer();
  9. +       final L2PcInstance targetPlayer = target.getActingPlayer();
  10.         if (player != null)
  11.         {
  12. -           final L2PcInstance targetPlayer = target.getActingPlayer();
  13.             if (targetPlayer != null)
  14.             {
  15.                 if (targetPlayer == caster || targetPlayer == player)
  16. @@ -2407,8 +2407,26 @@
  17.         else
  18.         {
  19.             // source is not playable
  20. -           if (!(target instanceof L2Playable))
  21. -               return false;
  22. +           if (caster instanceof L2Attackable)
  23. +           {
  24. +               // target is mob
  25. +               if (targetPlayer == null)
  26. +               {
  27. +                   if (target instanceof L2Attackable)
  28. +                   {
  29. +                       String casterEnemyClan = ((L2Attackable)caster).getEnemyClan();
  30. +                       if (casterEnemyClan == null || casterEnemyClan.isEmpty())
  31. +                           return false;
  32. +
  33. +                       String targetClan = ((L2Attackable)target).getClan();
  34. +                       if (targetClan == null || targetClan.isEmpty())
  35. +                           return false;
  36. +
  37. +                       if (!casterEnemyClan.equals(targetClan))
  38. +                           return false;
  39. +                   }
  40. +               }
  41. +           }
  42.         }
  43.        
  44.         if (geoEnabled && !GeoData.getInstance().canSeeTarget(caster, target))
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement