Proper showSiegeInfoWindow checks.
This commit is contained in:
@@ -20,6 +20,7 @@ import java.util.StringTokenizer;
|
|||||||
|
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||||
|
import org.l2jmobius.gameserver.model.entity.siege.FortSiege;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
|
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -147,11 +148,8 @@ public class FortMerchantInstance extends NpcWalkerInstance
|
|||||||
*/
|
*/
|
||||||
public void showSiegeInfoWindow(PlayerInstance player)
|
public void showSiegeInfoWindow(PlayerInstance player)
|
||||||
{
|
{
|
||||||
if (validateCondition(player))
|
final FortSiege siege = getFort().getSiege();
|
||||||
{
|
if (siege.getIsInProgress())
|
||||||
getFort().getSiege().listRegisterClan(player);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
||||||
html.setFile("data/html/fortress/merchant-busy.htm");
|
html.setFile("data/html/fortress/merchant-busy.htm");
|
||||||
@@ -160,10 +158,9 @@ public class FortMerchantInstance extends NpcWalkerInstance
|
|||||||
player.sendPacket(html);
|
player.sendPacket(html);
|
||||||
player.sendPacket(ActionFailed.STATIC_PACKET);
|
player.sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
|
{
|
||||||
private boolean validateCondition(PlayerInstance player)
|
siege.listRegisterClan(player);
|
||||||
{
|
}
|
||||||
return !getFort().getSiege().getIsInProgress();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model.actor.instance;
|
|||||||
|
|
||||||
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
import org.l2jmobius.gameserver.ai.CtrlIntention;
|
||||||
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
|
||||||
|
import org.l2jmobius.gameserver.model.entity.siege.Siege;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
|
import org.l2jmobius.gameserver.network.serverpackets.MyTargetSelected;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
|
||||||
@@ -74,11 +75,8 @@ public class SiegeNpcInstance extends FolkInstance
|
|||||||
*/
|
*/
|
||||||
public void showSiegeInfoWindow(PlayerInstance player)
|
public void showSiegeInfoWindow(PlayerInstance player)
|
||||||
{
|
{
|
||||||
if (validateCondition(player))
|
final Siege siege = getCastle().getSiege();
|
||||||
{
|
if (siege.getIsInProgress())
|
||||||
getCastle().getSiege().listRegisterClan(player);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
||||||
html.setFile("data/html/siege/" + getTemplate().npcId + "-busy.htm");
|
html.setFile("data/html/siege/" + getTemplate().npcId + "-busy.htm");
|
||||||
@@ -87,10 +85,9 @@ public class SiegeNpcInstance extends FolkInstance
|
|||||||
player.sendPacket(html);
|
player.sendPacket(html);
|
||||||
player.sendPacket(ActionFailed.STATIC_PACKET);
|
player.sendPacket(ActionFailed.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
|
{
|
||||||
private boolean validateCondition(PlayerInstance player)
|
siege.listRegisterClan(player);
|
||||||
{
|
}
|
||||||
return getCastle().getSiege().getIsInProgress();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user