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

Exclude non playables from isSiegeFriend mid victory check.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-04-05 21:53:49 +00:00
parent b62ccc548a
commit 02597f65af
25 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1677,13 +1677,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1679,13 +1679,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1681,13 +1681,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1691,13 +1691,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1687,13 +1687,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1687,13 +1687,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1687,13 +1687,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1705,13 +1705,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1707,13 +1707,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1724,13 +1724,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1726,13 +1726,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1726,13 +1726,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1636,13 +1636,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1657,13 +1657,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1646,13 +1646,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1646,13 +1646,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1644,13 +1644,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1657,13 +1657,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1657,13 +1657,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1677,13 +1677,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1643,13 +1643,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1734,13 +1734,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1765,13 +1765,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1771,13 +1771,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;

4
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@ -1771,13 +1771,13 @@ public class Player extends Playable
// Check first castle mid victory.
final Castle castle = CastleManager.getInstance().getCastleById(_siegeSide);
if ((castle != null) && !castle.isFirstMidVictory())
final Player targetPlayer = target.getActingPlayer();
if ((castle != null) && (targetPlayer != null) && !castle.isFirstMidVictory())
{
return true;
}
// If target isn't a player, is self, isn't on same siege or not on same state, not friends.
final Player targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (targetPlayer == this) || (targetPlayer.getSiegeSide() != _siegeSide) || (_siegeState != targetPlayer.getSiegeState()))
{
return false;