From e9e7d406286292f70a0ef5b1cf95cc77b1b1b99b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 2 Jul 2018 01:12:00 +0000 Subject: [PATCH] Replaced instanceof L2PetInstance with isPet method. --- .../handlers/admincommandhandlers/AdminEditChar.java | 8 ++++---- .../network/serverpackets/PetStatusUpdate.java | 2 +- .../handlers/admincommandhandlers/AdminEditChar.java | 8 ++++---- .../network/serverpackets/PetStatusUpdate.java | 2 +- .../handlers/admincommandhandlers/AdminEditChar.java | 8 ++++---- .../network/serverpackets/PetStatusUpdate.java | 2 +- .../handlers/admincommandhandlers/AdminEditChar.java | 8 ++++---- .../network/serverpackets/PetStatusUpdate.java | 2 +- .../handlers/admincommandhandlers/AdminEditChar.java | 10 +++++----- .../Q00144_PailakaInjuredDragon.java | 3 +-- .../gameserver/model/actor/stat/PlayableStat.java | 4 ++-- .../l2jmobius/gameserver/model/entity/TvTEvent.java | 3 +-- .../network/serverpackets/PetStatusUpdate.java | 2 +- .../handlers/admincommandhandlers/AdminEditChar.java | 8 ++++---- .../network/serverpackets/PetStatusUpdate.java | 2 +- .../handlers/admincommandhandlers/AdminEditChar.java | 8 ++++---- .../network/serverpackets/PetStatusUpdate.java | 2 +- .../handlers/admincommandhandlers/AdminEditChar.java | 8 ++++---- .../network/serverpackets/PetStatusUpdate.java | 2 +- 19 files changed, 45 insertions(+), 47 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index e574cf6734..4895d71690 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -598,7 +598,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -767,7 +767,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -809,7 +809,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); } @@ -1625,7 +1625,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", target.getInventory().getTotalWeight() + "/" + target.getMaxLoad()); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 7094c60a19..21beb356f1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d86edbd245..402235827c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -598,7 +598,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -767,7 +767,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -809,7 +809,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); } @@ -1645,7 +1645,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", target.getInventory().getTotalWeight() + "/" + target.getMaxLoad()); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 7094c60a19..21beb356f1 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d86edbd245..402235827c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -598,7 +598,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -767,7 +767,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -809,7 +809,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); } @@ -1645,7 +1645,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", target.getInventory().getTotalWeight() + "/" + target.getMaxLoad()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 7094c60a19..21beb356f1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index d86edbd245..402235827c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -598,7 +598,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -767,7 +767,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -809,7 +809,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); } @@ -1645,7 +1645,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", target.getInventory().getTotalWeight() + "/" + target.getMaxLoad()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 7094c60a19..21beb356f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 8d2d2c0082..8eb3a8d391 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -590,7 +590,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -763,7 +763,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -805,7 +805,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); } @@ -1537,7 +1537,7 @@ public class AdminEditChar implements IAdminCommandHandler html.replace("%mp%", (int) target.getStatus().getCurrentMp() + "/" + target.getStat().getMaxMp()); html.replace("%karma%", Integer.toString(target.getKarma())); html.replace("%race%", target.getTemplate().getRace().toString()); - if (target instanceof L2PetInstance) + if (target.isPet()) { final int objId = target.getActingPlayer().getObjectId(); html.replace("%inv%", " view"); @@ -1546,7 +1546,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", ((L2PetInstance) target).getInventory().getTotalWeight() + "/" + ((L2PetInstance) target).getMaxLoad()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 3f10ec9aee..8dd1040079 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -36,7 +36,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance; import com.l2jmobius.gameserver.model.holders.ItemChanceHolder; import com.l2jmobius.gameserver.model.instancezone.Instance; import com.l2jmobius.gameserver.model.instancezone.InstanceWorld; @@ -969,7 +968,7 @@ public class Q00144_PailakaInjuredDragon extends Quest private void checkMaxSummonLevel(L2PcInstance player) { final L2Summon pet = player.getSummon(); - if (pet instanceof L2PetInstance) + if ((pet != null) && pet.isPet()) { if (pet.getLevel() > MAX_SUMMON_LEVEL) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java index 9a2b6133af..ec40dfdecd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/stat/PlayableStat.java @@ -61,7 +61,7 @@ public class PlayableStat extends CharStat setExp(getExp() + value); byte minimumLevel = 1; - if (getActiveChar() instanceof L2PetInstance) + if (getActiveChar().isPet()) { // get minimum level from L2NpcTemplate minimumLevel = (byte) PetDataTable.getInstance().getPetMinLevel(((L2PetInstance) getActiveChar()).getTemplate().getId()); @@ -96,7 +96,7 @@ public class PlayableStat extends CharStat setExp(getExp() - value); byte minimumLevel = 1; - if (getActiveChar() instanceof L2PetInstance) + if (getActiveChar().isPet()) { // get minimum level from L2NpcTemplate minimumLevel = (byte) PetDataTable.getInstance().getPetMinLevel(((L2PetInstance) getActiveChar()).getTemplate().getId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java index 7a9bee552a..5a16e6bfe3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java @@ -40,7 +40,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance; import com.l2jmobius.gameserver.model.actor.instance.L2ServitorInstance; import com.l2jmobius.gameserver.model.events.EventDispatcher; import com.l2jmobius.gameserver.model.events.impl.events.OnTvTEventFinish; @@ -817,7 +816,7 @@ public class TvTEvent L2PcInstance killerPlayerInstance = null; - if ((killerCharacter instanceof L2PetInstance) || (killerCharacter instanceof L2ServitorInstance)) + if (killerCharacter.isPet() || (killerCharacter instanceof L2ServitorInstance)) { killerPlayerInstance = ((L2Summon) killerCharacter).getOwner(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 6594d252a8..c2400d0744 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 458f911e44..c859f437e3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -594,7 +594,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -763,7 +763,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -805,7 +805,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); } @@ -1621,7 +1621,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", target.getInventory().getTotalWeight() + "/" + target.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 7094c60a19..21beb356f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 458f911e44..c859f437e3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -594,7 +594,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -763,7 +763,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -805,7 +805,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList((L2PetInstance) target)); } @@ -1621,7 +1621,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", target.getInventory().getTotalWeight() + "/" + target.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 7094c60a19..21beb356f1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 381ebb85ec..4aab32e1ce 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -594,7 +594,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_fullfood")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance targetPet = (L2PetInstance) target; targetPet.setCurrentFed(targetPet.getMaxFed()); @@ -763,7 +763,7 @@ public class AdminEditChar implements IAdminCommandHandler else if (command.startsWith("admin_summon_setlvl")) { final L2Object target = activeChar.getTarget(); - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { final L2PetInstance pet = (L2PetInstance) target; try @@ -805,7 +805,7 @@ public class AdminEditChar implements IAdminCommandHandler target = activeChar.getTarget(); } - if (target instanceof L2PetInstance) + if ((target != null) && target.isPet()) { activeChar.sendPacket(new GMViewItemList(1, (L2PetInstance) target)); } @@ -1621,7 +1621,7 @@ public class AdminEditChar implements IAdminCommandHandler { html.replace("%inv%", "none"); } - if (target instanceof L2PetInstance) + if (target.isPet()) { html.replace("%food%", ((L2PetInstance) target).getCurrentFed() + "/" + ((L2PetInstance) target).getPetLevelData().getPetMaxFeed()); html.replace("%load%", target.getInventory().getTotalWeight() + "/" + target.getMaxLoad()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java index 7094c60a19..21beb356f1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/PetStatusUpdate.java @@ -34,7 +34,7 @@ public class PetStatusUpdate implements IClientOutgoingPacket public PetStatusUpdate(L2Summon summon) { _summon = summon; - if (_summon instanceof L2PetInstance) + if (_summon.isPet()) { final L2PetInstance pet = (L2PetInstance) _summon; _curFed = pet.getCurrentFed(); // how fed it is