Changeset 2256

Timestamp:

07/10/08 12:58:48 (3 months ago)

Author:

DrHouse

Message:

Fix in cubic targeting by Gigii-kun.

Quoting Gigii-kun:

• Fixes:
  ** problems in pvp targeting
  ** fix some issues about life cubics
  
• New features (PvP targeting):
  ** cubics wont attack from peace zone
  ** wont attack targets in peace zone
  ** if owner is in a party which is in a command channel then wont attack members of the command channel
  

Please read this thread for further information: http://www.l2jserver.com/forum/thread.php?threadid=29781

Files:

• trunk/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2CubicInstance.java (modified) (9 diffs)

trunk/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2CubicInstance.java

@@ -433 +433 @@
-                                enemy = null;
-
-_owner.getPvpFlag() > 0
+(_owner.getPvpFlag() > 0 && !_owner.isInsideZone(L2Character.ZONE_PEACE))
-                                {
-                                        if (_owner.getTarget() instanceof L2Summon)
@@ -453 +453 @@
-                                        if (enemy != null)
-                                        {
-
+
+
-                                                if (_owner.getParty() != null)
-                                                {
-                                                        if (_owner.getParty().getPartyMembers().contains(enemy))
-
+
+
+
+
+
+
-                                                }
-
-
+
-                                                        if (_owner.getClan().isMember(enemy.getCharId()))
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                                        {
-                                                                _target = (L2Character) _owner.getTarget();
@@ -480 +486 @@
-                List<L2Character> potentialTarget = new FastList<L2Character>();
-                List<L2Character> potentialPvPTarget = new FastList<L2Character>();
-K
+k
-                
-TgMob : K
+tgMob : k
-                        {
-                                // get the mobs which have aggro on the owner or his/her summon
-T
+t
-                                {
-T
-T
-T
+t
+t
+t
-                                if (_owner.getPet() != null)
-T
-T
+t
+t
-                                }
-                        // get enemy pvp targets
-_owner.getPvpFlag() > 0
+(_owner.getPvpFlag() > 0 && !_owner.isInsideZone(L2Character.ZONE_PEACE))
-                                {
-                                enemy = null;
-T
+t
-                                        {
-T
-T
+t
+t
-                                        }
-T
+t
-                                        {
-T
-T
+t
+t
-                                        }
-T
+t
-                                        {
-T
-T
+t
+t
-                                        }
-                        
-                                        if (enemy != null)
-                                        {
-T
+t
-                                                if (_owner.getParty() != null)
-                                                {
-                                                        if (_owner.getParty().getPartyMembers().contains(enemy))
-
+
+
+
+
+
+
-                                                }
-else if (_owner.getClan() != null && !_owner.isInsideZone(L2Character.ZONE_PVP))
-{
+
+if (_owner.getClan() != null && !_owner.isInsideZone(L2Character.ZONE_PVP))
-                                                        if (_owner.getClan().isMember(enemy.getCharId()))
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                                        }
-                                }
@@ -754 +766 @@
-                if (partyMember.getPet() != null)
-                {
-!
+
-                        
-                    //if party member's pet not dead, check if it is in castrange of heal cubic
-
+!
-
-                    // member's pet is in cubic casting range, check if he need heal and if he have the lowest HP                               
@@ -779 +791 @@
-            }
-            if (_owner.getPet() != null)
-
-
+
+
+
-                {
-                        target = _owner.getPet();
@@ -786 +799 @@
-                }
-        }
-
-
-
-
-
+
+
-    }
-
@@ -833 +843 @@
-                {
-                    CubicTargetForHeal();
-
+
+
-                    {
-_target.getCurrentHp() / _target.getMaxHp()
+(target.getCurrentHp() / target.getMaxHp())* 100.0
-                    
-                        int typeHeal = 1; //1 = 60%+; 2= 30-60%; 3=30%-
@@ -855 +866 @@
-                        }
-                    
-
-
+
+
+
-                                        ISkillHandler handler = SkillHandler.getInstance().getSkillHandler(skill.getSkillType());
-                                        if (handler != null)
@@ -866 +878 @@
-                                                skill.useSkill(_owner, targets);
-                                        }
-
-
+
+
+
-                                        _owner.broadcastPacket(msu);
-                                }