From 767ce5b2ed49068f210d00ecae20026c908c3d1c Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 11 Jun 2021 01:28:47 +0000
Subject: [PATCH] Fixed pet food. Contributed by manax182.

---
 .../scripts/handlers/targethandlers/Pet.java     |  2 +-
 .../dist/game/data/stats/items/93900-93999.xml   | 16 ++++++++--------
 .../dist/game/data/stats/skills/02000-02099.xml  |  8 ++++----
 .../scripts/handlers/targethandlers/Pet.java     |  2 +-
 .../dist/game/data/stats/items/93900-93999.xml   | 16 ++++++++--------
 .../dist/game/data/stats/skills/02000-02099.xml  |  8 ++++----
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Pet.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Pet.java
index eb3c1dce8b..1c2dc4eb3c 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Pet.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Pet.java
@@ -36,7 +36,7 @@ public class Pet implements ITargetTypeHandler
 	@Override
 	public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
 	{
-		if (creature.isPet())
+		if ((creature.isPet()) || creature.hasPet())
 		{
 			return creature.getPet();
 		}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml
index 1ac6c5e285..c86fc3052c 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml
@@ -893,16 +893,16 @@
 		<!-- Pet's satiety +1000. -->
 		<set name="icon" val="BranchSys3.icon1.g_studentenfutter_germany" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="SCROLL" />
-		<set name="material" val="PAPER" />
-		<set name="is_stackable" val="true" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
-		<set name="is_oly_restricted" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="handler" val="ItemSkills" />
+		<set name="material" val="PAPER" />
+		<set name="weight" val="1" />
+		<set name="price" val="30" />
+		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 		<set name="reuse_delay" val="60000"/>
-		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<cond addName="1" msgId="113">
 			<player flyMounted="false" />
 		</cond>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02000-02099.xml
index 79bd20fa14..73931d1b8f 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02000-02099.xml
@@ -662,6 +662,8 @@
 			<condition name="CanSummonPet" />
 			<condition name="OpCheckResidence">
 				<residencesId>
+					<item>32</item>
+					<item>33</item>
 					<item>36</item>
 					<item>37</item>
 					<item>38</item>
@@ -695,10 +697,7 @@
 	<skill id="2048" toLevel="1" name="Pet Food">
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<abnormalTime>300</abnormalTime>
 		<operateType>A1</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeCount>1</itemConsumeCount>
@@ -965,10 +964,11 @@
 	<skill id="2060" toLevel="1" name="Healing Medicine">
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
+		<abnormalTime>300</abnormalTime>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<targetType>SELF</targetType>
+		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Pet.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Pet.java
index eb3c1dce8b..1c2dc4eb3c 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Pet.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Pet.java
@@ -36,7 +36,7 @@ public class Pet implements ITargetTypeHandler
 	@Override
 	public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage)
 	{
-		if (creature.isPet())
+		if ((creature.isPet()) || creature.hasPet())
 		{
 			return creature.getPet();
 		}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml
index 1ac6c5e285..c86fc3052c 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml
@@ -893,16 +893,16 @@
 		<!-- Pet's satiety +1000. -->
 		<set name="icon" val="BranchSys3.icon1.g_studentenfutter_germany" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="SCROLL" />
-		<set name="material" val="PAPER" />
-		<set name="is_stackable" val="true" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
-		<set name="is_oly_restricted" val="true" />
+		<set name="immediate_effect" val="true" />
+		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="handler" val="ItemSkills" />
+		<set name="material" val="PAPER" />
+		<set name="weight" val="1" />
+		<set name="price" val="30" />
+		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
 		<set name="reuse_delay" val="60000"/>
-		<set name="commissionItemType" val="SCROLL_OTHER" />
 		<cond addName="1" msgId="113">
 			<player flyMounted="false" />
 		</cond>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02000-02099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02000-02099.xml
index d883c23728..d4d1febf79 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02000-02099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02000-02099.xml
@@ -662,6 +662,8 @@
 			<condition name="CanSummonPet" />
 			<condition name="OpCheckResidence">
 				<residencesId>
+					<item>32</item>
+					<item>33</item>
 					<item>36</item>
 					<item>37</item>
 					<item>38</item>
@@ -695,10 +697,7 @@
 	<skill id="2048" toLevel="1" name="Pet Food">
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<abnormalTime>300</abnormalTime>
 		<operateType>A1</operateType>
-		<magicCriticalRate>5</magicCriticalRate>
-		<hitCancelTime>0</hitCancelTime>
 		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<itemConsumeCount>1</itemConsumeCount>
@@ -965,10 +964,11 @@
 	<skill id="2060" toLevel="1" name="Healing Medicine">
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
+		<abnormalTime>300</abnormalTime>
 		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<targetType>SELF</targetType>
+		<targetType>PET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">