Changeset 2290
- Timestamp:
- 07/21/08 07:30:57 (3 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2CubicInstance.java
r2275 r2290 466 466 } 467 467 if (_owner.getClan() != null && !_owner.isInsideZone(L2Character.ZONE_PVP)) 468 if (_owner.getClan().isMember(enemy.getCharId())) 468 { 469 if (_owner.getClan().isMember(enemy.getObjectId())) 469 470 targetIt = false; 471 if (_owner.getAllyId() > 0 && enemy.getAllyId() > 0) 472 { 473 if (_owner.getAllyId() == enemy.getAllyId()) 474 targetIt = false; 475 } 476 } 470 477 if (enemy.getPvpFlag() == 0 && !enemy.isInsideZone(L2Character.ZONE_SIEGE) && !enemy.isInsideZone(L2Character.ZONE_PVP)) 471 478 targetIt = false; … … 535 542 536 543 if (_owner.getClan() != null && !_owner.isInsideZone(L2Character.ZONE_PVP)) 537 if (_owner.getClan().isMember(enemy.getCharId())) 544 { 545 if (_owner.getClan().isMember(enemy.getObjectId())) 538 546 targetIt = false; 547 if (_owner.getAllyId() > 0 && enemy.getAllyId() > 0) 548 { 549 if (_owner.getAllyId() == enemy.getAllyId()) 550 targetIt = false; 551 } 552 } 539 553 if (enemy.getPvpFlag() == 0 && !enemy.isInsideZone(L2Character.ZONE_SIEGE) && !enemy.isInsideZone(L2Character.ZONE_PVP)) 540 554 targetIt = false;
