diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index 305ebab539..d4b6e7f73b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -70,6 +70,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket if (chance > TEMPLATE.getMaxChance()) { player.sendMessage("Homunculus is not created!"); + player.sendPacket(new ExHomunculusSummonResult(0)); return; } for (int i = 0; i < TEMPLATE.getCreationChance().size(); i++) @@ -99,8 +100,8 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket player.getVariables().set(PlayerVariables.HOMUNCULUS_SP_POINTS, 0); player.getVariables().set(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); player.sendPacket(new ExShowHomunculusBirthInfo(player)); + player.sendPacket(new ExHomunculusSummonResult(1)); player.sendPacket(new ExShowHomunculusList(player)); - player.sendPacket(new ExHomunculusSummonResult()); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java index f52a9c1d38..e5c7d64dba 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java @@ -23,15 +23,18 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExHomunculusSummonResult implements IClientOutgoingPacket { - public ExHomunculusSummonResult() + private final int _success; + + public ExHomunculusSummonResult(int success) { + _success = success; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_SUMMON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success + packet.writeD(_success); // 1 - success packet.writeD(SystemMessageId.A_NEW_HOMUNCULUS_IS_CREATED.getId()); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index c7acfe0cc6..d4b6e7f73b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExHomunculusSummonResult; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusList; -import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExSummonHomunculusCouponResult; /** * @author Mobius @@ -71,7 +70,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket if (chance > TEMPLATE.getMaxChance()) { player.sendMessage("Homunculus is not created!"); - player.sendPacket(new ExSummonHomunculusCouponResult(0, 0)); + player.sendPacket(new ExHomunculusSummonResult(0)); return; } for (int i = 0; i < TEMPLATE.getCreationChance().size(); i++) @@ -101,8 +100,8 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket player.getVariables().set(PlayerVariables.HOMUNCULUS_SP_POINTS, 0); player.getVariables().set(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); player.sendPacket(new ExShowHomunculusBirthInfo(player)); + player.sendPacket(new ExHomunculusSummonResult(1)); player.sendPacket(new ExShowHomunculusList(player)); - player.sendPacket(new ExHomunculusSummonResult()); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java index f52a9c1d38..e5c7d64dba 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java @@ -23,15 +23,18 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExHomunculusSummonResult implements IClientOutgoingPacket { - public ExHomunculusSummonResult() + private final int _success; + + public ExHomunculusSummonResult(int success) { + _success = success; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_SUMMON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success + packet.writeD(_success); // 1 - success packet.writeD(SystemMessageId.A_NEW_HOMUNCULUS_IS_CREATED.getId()); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java index 22597b6716..a7cc43f978 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket { private final int _slot; - private int _success = -1; + private int _success; public ExSummonHomunculusCouponResult(int slot) { @@ -43,14 +43,7 @@ public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUMMON_HOMUNCULUS_COUPON_RESULT.writeId(packet); - if (_success == -1) - { - packet.writeD(1); // 1 - success - } - else - { - packet.writeD(_success); - } + packet.writeD(_success); packet.writeD(_slot); // homunculus slot packet.writeD(0); // keep or delete return true; diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index c7acfe0cc6..d4b6e7f73b 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExHomunculusSummonResult; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusList; -import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExSummonHomunculusCouponResult; /** * @author Mobius @@ -71,7 +70,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket if (chance > TEMPLATE.getMaxChance()) { player.sendMessage("Homunculus is not created!"); - player.sendPacket(new ExSummonHomunculusCouponResult(0, 0)); + player.sendPacket(new ExHomunculusSummonResult(0)); return; } for (int i = 0; i < TEMPLATE.getCreationChance().size(); i++) @@ -101,8 +100,8 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket player.getVariables().set(PlayerVariables.HOMUNCULUS_SP_POINTS, 0); player.getVariables().set(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); player.sendPacket(new ExShowHomunculusBirthInfo(player)); + player.sendPacket(new ExHomunculusSummonResult(1)); player.sendPacket(new ExShowHomunculusList(player)); - player.sendPacket(new ExHomunculusSummonResult()); } } } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java index f52a9c1d38..e5c7d64dba 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java @@ -23,15 +23,18 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExHomunculusSummonResult implements IClientOutgoingPacket { - public ExHomunculusSummonResult() + private final int _success; + + public ExHomunculusSummonResult(int success) { + _success = success; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_SUMMON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success + packet.writeD(_success); // 1 - success packet.writeD(SystemMessageId.A_NEW_HOMUNCULUS_IS_CREATED.getId()); return true; } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java index 22597b6716..a7cc43f978 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket { private final int _slot; - private int _success = -1; + private int _success; public ExSummonHomunculusCouponResult(int slot) { @@ -43,14 +43,7 @@ public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUMMON_HOMUNCULUS_COUPON_RESULT.writeId(packet); - if (_success == -1) - { - packet.writeD(1); // 1 - success - } - else - { - packet.writeD(_success); - } + packet.writeD(_success); packet.writeD(_slot); // homunculus slot packet.writeD(0); // keep or delete return true; diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java index c7acfe0cc6..d4b6e7f73b 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/homunculus/RequestExHomunculusSummon.java @@ -31,7 +31,6 @@ import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExHomunculusSummonResult; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusBirthInfo; import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExShowHomunculusList; -import org.l2jmobius.gameserver.network.serverpackets.homunculus.ExSummonHomunculusCouponResult; /** * @author Mobius @@ -71,7 +70,7 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket if (chance > TEMPLATE.getMaxChance()) { player.sendMessage("Homunculus is not created!"); - player.sendPacket(new ExSummonHomunculusCouponResult(0, 0)); + player.sendPacket(new ExHomunculusSummonResult(0)); return; } for (int i = 0; i < TEMPLATE.getCreationChance().size(); i++) @@ -101,8 +100,8 @@ public class RequestExHomunculusSummon implements IClientIncomingPacket player.getVariables().set(PlayerVariables.HOMUNCULUS_SP_POINTS, 0); player.getVariables().set(PlayerVariables.HOMUNCULUS_VP_POINTS, 0); player.sendPacket(new ExShowHomunculusBirthInfo(player)); + player.sendPacket(new ExHomunculusSummonResult(1)); player.sendPacket(new ExShowHomunculusList(player)); - player.sendPacket(new ExHomunculusSummonResult()); } } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java index f52a9c1d38..e5c7d64dba 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExHomunculusSummonResult.java @@ -23,15 +23,18 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExHomunculusSummonResult implements IClientOutgoingPacket { - public ExHomunculusSummonResult() + private final int _success; + + public ExHomunculusSummonResult(int success) { + _success = success; } @Override public boolean write(PacketWriter packet) { OutgoingPackets.EX_HOMUNCULUS_SUMMON_RESULT.writeId(packet); - packet.writeD(1); // 1 - success + packet.writeD(_success); // 1 - success packet.writeD(SystemMessageId.A_NEW_HOMUNCULUS_IS_CREATED.getId()); return true; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java index 22597b6716..a7cc43f978 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/homunculus/ExSummonHomunculusCouponResult.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket; public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket { private final int _slot; - private int _success = -1; + private int _success; public ExSummonHomunculusCouponResult(int slot) { @@ -43,14 +43,7 @@ public class ExSummonHomunculusCouponResult implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.EX_SUMMON_HOMUNCULUS_COUPON_RESULT.writeId(packet); - if (_success == -1) - { - packet.writeD(1); // 1 - success - } - else - { - packet.writeD(_success); - } + packet.writeD(_success); packet.writeD(_slot); // homunculus slot packet.writeD(0); // keep or delete return true;