diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java index f761f435f9..4d8eec7dfc 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/MasterHandler.java @@ -263,6 +263,7 @@ import handlers.targethandlers.NpcBody; import handlers.targethandlers.Others; import handlers.targethandlers.OwnerPet; import handlers.targethandlers.PcBody; +import handlers.targethandlers.Pet; import handlers.targethandlers.Self; import handlers.targethandlers.Summon; import handlers.targethandlers.Target; @@ -626,6 +627,7 @@ public class MasterHandler Others.class, OwnerPet.class, PcBody.class, + Pet.class, Self.class, Summon.class, Target.class, 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 new file mode 100644 index 0000000000..eb3c1dce8b --- /dev/null +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Pet.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.targethandlers; + +import org.l2jmobius.gameserver.handler.ITargetTypeHandler; +import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.skills.targets.TargetType; + +/** + * @author Manax + */ +public class Pet implements ITargetTypeHandler +{ + @Override + public Enum getTargetType() + { + return TargetType.PET; + } + + @Override + public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) + { + if (creature.isPet()) + { + return creature.getPet(); + } + return null; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java index 869a891f6d..ab8aaeff8d 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java @@ -64,4 +64,6 @@ public enum TargetType MY_PARTY, /** Pet's owner. */ OWNER_PET, + /** Pet Target */ + PET, } diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/MasterHandler.java index f761f435f9..4d8eec7dfc 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/MasterHandler.java @@ -263,6 +263,7 @@ import handlers.targethandlers.NpcBody; import handlers.targethandlers.Others; import handlers.targethandlers.OwnerPet; import handlers.targethandlers.PcBody; +import handlers.targethandlers.Pet; import handlers.targethandlers.Self; import handlers.targethandlers.Summon; import handlers.targethandlers.Target; @@ -626,6 +627,7 @@ public class MasterHandler Others.class, OwnerPet.class, PcBody.class, + Pet.class, Self.class, Summon.class, Target.class, 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 new file mode 100644 index 0000000000..eb3c1dce8b --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Pet.java @@ -0,0 +1,45 @@ +/* + * This file is part of the L2J Mobius project. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package handlers.targethandlers; + +import org.l2jmobius.gameserver.handler.ITargetTypeHandler; +import org.l2jmobius.gameserver.model.WorldObject; +import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.skills.Skill; +import org.l2jmobius.gameserver.model.skills.targets.TargetType; + +/** + * @author Manax + */ +public class Pet implements ITargetTypeHandler +{ + @Override + public Enum getTargetType() + { + return TargetType.PET; + } + + @Override + public WorldObject getTarget(Creature creature, WorldObject selectedTarget, Skill skill, boolean forceUse, boolean dontMove, boolean sendMessage) + { + if (creature.isPet()) + { + return creature.getPet(); + } + return null; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java index 869a891f6d..ab8aaeff8d 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/skills/targets/TargetType.java @@ -64,4 +64,6 @@ public enum TargetType MY_PARTY, /** Pet's owner. */ OWNER_PET, + /** Pet Target */ + PET, } diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java index 96ba66e687..024a7bc691 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/network/serverpackets/RelationChanged.java @@ -44,8 +44,8 @@ public class RelationChanged implements IClientOutgoingPacket public static final int RELATION_ENEMY = 0x8000; // true when red icon, doesn't matter with blue public static final int RELATION_ALLY_MEMBER = 0x10000; // clan is in alliance public static final int RELATION_TERRITORY_WAR = 0x80000; // show Territory War icon - public static final long RELATION_DECLARED_WAR = 0x40000000L; // single sword 0x4E200000L - public static final long RELATION_MUTUAL_WAR = 0x4E200000L; // double swords 0x40000000L + public static final long RELATION_DECLARED_WAR = 0x40000000L; // single sword + public static final long RELATION_MUTUAL_WAR = 0x4E200000L; // double swords? // Masks public static final byte SEND_DEFAULT = 0x01; public static final byte SEND_ONE = 0x02;