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

Sync with L2jServer HighFive Mar 1st 2015.

Browse Source
This commit is contained in:
mobius
2015-03-01 22:48:14 +00:00
parent f14af24b41
commit 6fa0ed56e3
116 changed files with 971 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java vendored
View File

@@ -140,7 +140,7 @@ public final class CastleAmbassador extends AbstractNpcAI
final int fortOwner = fortresss.getOwnerClan() == null ? 0 : fortresss.getOwnerClan().getId();
String htmltext = null;
if (player.isClanLeader() && (player.getClan() != null) && (player.getClanId() == fortOwner))
if (player.isClanLeader() && (player.getClanId() == fortOwner))
{
htmltext = (fortresss.isBorderFortress()) ? "ambassador-01.html" : "ambassador.html";
}

34
trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java vendored
View File

@@ -19,7 +19,6 @@
package ai.npc.NpcBuffers;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -133,32 +132,27 @@ public class NpcBufferAI implements Runnable
return true;
}
if (player.isInParty() && targetPlayer.isInParty())
{
final L2Party party = player.getParty();
if (party.containsPlayer(targetPlayer))
{
return true;
}
if (party.isInCommandChannel() && party.getCommandChannel().containsPlayer(targetPlayer))
{
return true;
}
}
if ((player.getClanId() > 0) && (player.getClanId() == targetPlayer.getClanId()))
if (player.isInPartyWith(targetPlayer))
{
return true;
}
if ((player.getAllyId() > 0) && (player.getAllyId() == targetPlayer.getAllyId()))
if (player.isInCommandChannelWith(targetPlayer))
{
return true;
}
if ((player.getSiegeState() > 0) && player.isInsideZone(ZoneId.SIEGE) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
if (player.isInClanWith(targetPlayer))
{
return true;
}
if (player.isInAllyWith(targetPlayer))
{
return true;
}
if (player.isOnSameSiegeSideWith(targetPlayer))
{
return true;
}
@@ -205,7 +199,7 @@ public class NpcBufferAI implements Runnable
return true;
}
if ((player.getClan() != null) && (targetPlayer.getClan() != null) && player.getClan().isAtWarWith(targetPlayer.getClan()))
if (player.isAtWarWith(targetPlayer))
{
return true;
}

16
trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java vendored
View File

@@ -123,30 +123,34 @@ public final class WyvernManager extends AbstractNpcAI
private boolean isOwnerClan(L2Npc npc, L2PcInstance player)
{
if (!player.isClanLeader())
{
return false;
}
switch (MANAGERS.get(npc.getId()))
{
case CASTLE:
{
if ((player.getClan() != null) && (npc.getCastle() != null))
if (npc.getCastle() != null)
{
return (player.isClanLeader() && (player.getClanId() == npc.getCastle().getOwnerId()));
return player.getClanId() == npc.getCastle().getOwnerId();
}
return false;
}
case CLAN_HALL:
{
if ((player.getClan() != null) && (npc.getConquerableHall() != null))
if (npc.getConquerableHall() != null)
{
return (player.isClanLeader() && (player.getClanId() == npc.getConquerableHall().getOwnerId()));
return player.getClanId() == npc.getConquerableHall().getOwnerId();
}
return false;
}
case FORT:
{
final Fort fort = npc.getFort();
if ((player.getClan() != null) && (fort != null) && (fort.getOwnerClan() != null))
if ((fort != null) && (fort.getOwnerClan() != null))
{
return (player.isClanLeader() && (player.getClanId() == npc.getFort().getOwnerClan().getId()));
return player.getClanId() == npc.getFort().getOwnerClan().getId();
}
return false;
}