Proper PA open html.

This commit is contained in:
MobiusDevelopment
2020-01-07 19:26:45 +00:00
parent e57c672035
commit 10d3a6707d
4 changed files with 51 additions and 55 deletions

View File

@@ -481,7 +481,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
EX_PURCHASE_LIMIT_SHOP_ITEM_LIST(0x162, null, ConnectionState.IN_GAME), EX_PURCHASE_LIMIT_SHOP_ITEM_LIST(0x162, null, ConnectionState.IN_GAME),
EX_PURCHASE_LIMIT_SHOP_ITEM_BUY(0x163, null, ConnectionState.IN_GAME), EX_PURCHASE_LIMIT_SHOP_ITEM_BUY(0x163, null, ConnectionState.IN_GAME),
// 228 // 228
EX_OPEN_HTML(0x164, ExOpenDimensionalHtml::new, ConnectionState.IN_GAME), EX_OPEN_HTML(0x164, ExOpenHtml::new, ConnectionState.IN_GAME),
EX_REQUEST_CLASS_CHANGE(0x165, ExRequestClassChange::new, ConnectionState.IN_GAME), EX_REQUEST_CLASS_CHANGE(0x165, ExRequestClassChange::new, ConnectionState.IN_GAME),
EX_REQUEST_CLASS_CHANGE_VERIFYING(0x166, null, ConnectionState.IN_GAME), EX_REQUEST_CLASS_CHANGE_VERIFYING(0x166, null, ConnectionState.IN_GAME),
EX_REQUEST_TELEPORT(0x167, ExRequestTeleport::new, ConnectionState.IN_GAME), EX_REQUEST_TELEPORT(0x167, ExRequestTeleport::new, ConnectionState.IN_GAME),

View File

@@ -16,8 +16,8 @@
*/ */
package org.l2jmobius.gameserver.network.clientpackets; package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.GameClient; import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
/** /**
* @author Mobius * @author Mobius
*/ */
public class ExOpenDimensionalHtml implements IClientIncomingPacket public class ExOpenHtml implements IClientIncomingPacket
{ {
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)
@@ -38,15 +38,11 @@ public class ExOpenDimensionalHtml implements IClientIncomingPacket
public void run(GameClient client) public void run(GameClient client)
{ {
final PlayerInstance player = client.getPlayer(); final PlayerInstance player = client.getPlayer();
if (player == null) if ((player != null) && Config.PC_CAFE_ENABLED)
{ {
return;
}
// FIXME:
// client.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/DimensionalMerchant/32478.html")));
final NpcHtmlMessage html = new NpcHtmlMessage(); final NpcHtmlMessage html = new NpcHtmlMessage();
html.setHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/DimensionalMerchant/32478.html")); html.setFile(player, "data/html/pccafe.htm");
player.sendPacket(html); player.sendPacket(html);
} }
} }
}

View File

@@ -472,7 +472,7 @@ public enum ExIncomingPackets implements IIncomingPackets<GameClient>
EX_PURCHASE_LIMIT_SHOP_ITEM_LIST(0x162, null, ConnectionState.IN_GAME), EX_PURCHASE_LIMIT_SHOP_ITEM_LIST(0x162, null, ConnectionState.IN_GAME),
EX_PURCHASE_LIMIT_SHOP_ITEM_BUY(0x163, null, ConnectionState.IN_GAME), EX_PURCHASE_LIMIT_SHOP_ITEM_BUY(0x163, null, ConnectionState.IN_GAME),
// 228 // 228
EX_OPEN_HTML(0x164, ExOpenDimensionalHtml::new, ConnectionState.IN_GAME), EX_OPEN_HTML(0x164, ExOpenHtml::new, ConnectionState.IN_GAME),
EX_REQUEST_CLASS_CHANGE(0x165, ExRequestClassChange::new, ConnectionState.IN_GAME), EX_REQUEST_CLASS_CHANGE(0x165, ExRequestClassChange::new, ConnectionState.IN_GAME),
EX_REQUEST_CLASS_CHANGE_VERIFYING(0x166, null, ConnectionState.IN_GAME), EX_REQUEST_CLASS_CHANGE_VERIFYING(0x166, null, ConnectionState.IN_GAME),
EX_REQUEST_TELEPORT(0x167, ExRequestTeleport::new, ConnectionState.IN_GAME), EX_REQUEST_TELEPORT(0x167, ExRequestTeleport::new, ConnectionState.IN_GAME),

View File

@@ -25,7 +25,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
/** /**
* @author Mobius * @author Mobius
*/ */
public class ExOpenDimensionalHtml implements IClientIncomingPacket public class ExOpenHtml implements IClientIncomingPacket
{ {
@Override @Override
public boolean read(GameClient client, PacketReader packet) public boolean read(GameClient client, PacketReader packet)