From d05e36cd1d7b35f3ec28f17ffc78a68409132dd4 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 11 Sep 2018 04:16:37 +0000 Subject: [PATCH] Fixed summon name not showing. --- .../gameserver/model/actor/L2Summon.java | 15 ++------------- .../gameserver/model/actor/L2Summon.java | 15 ++------------- .../gameserver/model/actor/L2Summon.java | 15 ++------------- .../gameserver/model/actor/L2Summon.java | 15 ++------------- .../gameserver/model/actor/L2Summon.java | 15 ++------------- .../gameserver/model/actor/L2Summon.java | 15 ++------------- .../gameserver/model/actor/L2Summon.java | 15 ++------------- 7 files changed, 14 insertions(+), 91 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 34975eba05..3897f93273 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -819,14 +819,7 @@ public abstract class L2Summon extends L2Playable return; } - if (isPet()) - { - player.sendPacket(new ExPetInfo(this, player, val)); - } - else - { - player.sendPacket(new SummonInfo(this, player, val)); - } + player.sendPacket(new ExPetInfo(this, player, val)); }); } @@ -857,13 +850,9 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } - else if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } else { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 34975eba05..3897f93273 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -819,14 +819,7 @@ public abstract class L2Summon extends L2Playable return; } - if (isPet()) - { - player.sendPacket(new ExPetInfo(this, player, val)); - } - else - { - player.sendPacket(new SummonInfo(this, player, val)); - } + player.sendPacket(new ExPetInfo(this, player, val)); }); } @@ -857,13 +850,9 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } - else if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } else { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 152e853498..99c71d08e9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -819,14 +819,7 @@ public abstract class L2Summon extends L2Playable return; } - if (isPet()) - { - player.sendPacket(new ExPetInfo(this, player, val)); - } - else - { - player.sendPacket(new SummonInfo(this, player, val)); - } + player.sendPacket(new ExPetInfo(this, player, val)); }); } @@ -857,13 +850,9 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } - else if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } else { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index 152e853498..99c71d08e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -819,14 +819,7 @@ public abstract class L2Summon extends L2Playable return; } - if (isPet()) - { - player.sendPacket(new ExPetInfo(this, player, val)); - } - else - { - player.sendPacket(new SummonInfo(this, player, val)); - } + player.sendPacket(new ExPetInfo(this, player, val)); }); } @@ -857,13 +850,9 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } - else if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } else { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index dd19767c8d..aaf58f7a84 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -819,14 +819,7 @@ public abstract class L2Summon extends L2Playable return; } - if (isPet()) - { - player.sendPacket(new ExPetInfo(this, player, val)); - } - else - { - player.sendPacket(new SummonInfo(this, player, val)); - } + player.sendPacket(new ExPetInfo(this, player, val)); }); } @@ -857,13 +850,9 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } - else if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } else { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index dd19767c8d..aaf58f7a84 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -819,14 +819,7 @@ public abstract class L2Summon extends L2Playable return; } - if (isPet()) - { - player.sendPacket(new ExPetInfo(this, player, val)); - } - else - { - player.sendPacket(new SummonInfo(this, player, val)); - } + player.sendPacket(new ExPetInfo(this, player, val)); }); } @@ -857,13 +850,9 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } - else if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } else { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java index dd19767c8d..aaf58f7a84 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java @@ -819,14 +819,7 @@ public abstract class L2Summon extends L2Playable return; } - if (isPet()) - { - player.sendPacket(new ExPetInfo(this, player, val)); - } - else - { - player.sendPacket(new SummonInfo(this, player, val)); - } + player.sendPacket(new ExPetInfo(this, player, val)); }); } @@ -857,13 +850,9 @@ public abstract class L2Summon extends L2Playable activeChar.sendPacket(new PetItemList(getInventory().getItems())); } } - else if (isPet()) - { - activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); - } else { - activeChar.sendPacket(new SummonInfo(this, activeChar, 0)); + activeChar.sendPacket(new ExPetInfo(this, activeChar, 0)); } }