Fixed moving shortcuts.

Thanks to NviX.
This commit is contained in:
MobiusDevelopment
2019-09-06 00:51:34 +00:00
parent af88b94651
commit e36cdcafcf
4 changed files with 7 additions and 5 deletions

View File

@@ -46,7 +46,7 @@ public class RequestShortCutDel implements IClientIncomingPacket
return; return;
} }
if ((_page > 19) || (_page < 0)) if ((_page > 23) || (_page < 0))
{ {
return; return;
} }

View File

@@ -40,6 +40,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
final int slot = packet.readD(); final int slot = packet.readD();
_slot = slot % 12; _slot = slot % 12;
_page = slot / 12; _page = slot / 12;
packet.readC(); // 228
_id = packet.readD(); _id = packet.readD();
_lvl = packet.readH(); _lvl = packet.readH();
_subLvl = packet.readH(); // Sublevel _subLvl = packet.readH(); // Sublevel
@@ -50,7 +51,7 @@ public class RequestShortCutReg implements IClientIncomingPacket
@Override @Override
public void run(GameClient client) public void run(GameClient client)
{ {
if ((client.getPlayer() == null) || (_page > 19) || (_page < 0)) if ((client.getPlayer() == null) || (_page > 23) || (_page < 0))
{ {
return; return;
} }

View File

@@ -46,6 +46,8 @@ public class ShortCutInit implements IClientOutgoingPacket
packet.writeD(sc.getType().ordinal()); packet.writeD(sc.getType().ordinal());
packet.writeD(sc.getSlot() + (sc.getPage() * 12)); packet.writeD(sc.getSlot() + (sc.getPage() * 12));
packet.writeC(0x00); // 228
switch (sc.getType()) switch (sc.getType())
{ {
case ITEM: case ITEM:
@@ -64,7 +66,6 @@ public class ShortCutInit implements IClientOutgoingPacket
packet.writeD(sc.getId()); packet.writeD(sc.getId());
packet.writeH(sc.getLevel()); packet.writeH(sc.getLevel());
packet.writeH(sc.getSubLevel()); packet.writeH(sc.getSubLevel());
packet.writeC(0x00); // 228
packet.writeD(sc.getSharedReuseGroup()); packet.writeD(sc.getSharedReuseGroup());
packet.writeC(0x00); // C5 packet.writeC(0x00); // C5
packet.writeD(0x01); // C6 packet.writeD(0x01); // C6
@@ -75,7 +76,6 @@ public class ShortCutInit implements IClientOutgoingPacket
case RECIPE: case RECIPE:
case BOOKMARK: case BOOKMARK:
{ {
packet.writeC(0x00); // 228
packet.writeD(sc.getId()); packet.writeD(sc.getId());
packet.writeD(0x01); // C6 packet.writeD(0x01); // C6
} }

View File

@@ -41,6 +41,8 @@ public class ShortCutRegister implements IClientOutgoingPacket
packet.writeD(_shortcut.getType().ordinal()); packet.writeD(_shortcut.getType().ordinal());
packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client packet.writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client
packet.writeC(0x00); // 228
switch (_shortcut.getType()) switch (_shortcut.getType())
{ {
case ITEM: case ITEM:
@@ -59,7 +61,6 @@ public class ShortCutRegister implements IClientOutgoingPacket
packet.writeD(_shortcut.getId()); packet.writeD(_shortcut.getId());
packet.writeH(_shortcut.getLevel()); packet.writeH(_shortcut.getLevel());
packet.writeH(_shortcut.getSubLevel()); packet.writeH(_shortcut.getSubLevel());
packet.writeC(0x00); // 228
packet.writeD(_shortcut.getSharedReuseGroup()); packet.writeD(_shortcut.getSharedReuseGroup());
packet.writeC(0x00); // C5 packet.writeC(0x00); // C5
packet.writeD(_shortcut.getCharacterType()); packet.writeD(_shortcut.getCharacterType());