From ee416019107b5c5742fc90f110c33ab511b14157 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 21 Apr 2020 09:26:42 +0000 Subject: [PATCH] Show Star Stone gathering skill when transformed. --- .../model/actor/instance/PlayerInstance.java | 11 ++++++++--- .../model/actor/instance/PlayerInstance.java | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 7c7ea10e6c..68e05cd062 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -10016,6 +10016,7 @@ public class PlayerInstance extends Playable sl.addSkill(s.getDisplayId(), s.getDisplayLevel(), s.isPassive(), isDisabled, isEnchantable); } + if (_transformation != null) { final Map ts = new TreeMap<>(); @@ -10041,11 +10042,14 @@ public class PlayerInstance extends Playable } // Add collection skills. - for (SkillLearn skill : SkillTreeData.getInstance().getCollectSkillTree().values()) + if (_transformation.isFlying()) { - if (getKnownSkill(skill.getSkillId()) != null) + for (SkillLearn skill : SkillTreeData.getInstance().getCollectSkillTree().values()) { - addTransformSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel())); + if ((getKnownSkill(skill.getSkillId()) != null) && (!ts.containsKey(skill.getSkillId()) || (ts.get(skill.getSkillId()) < skill.getSkillLevel()))) + { + ts.put(skill.getSkillId(), skill.getSkillLevel()); + } } } @@ -10056,6 +10060,7 @@ public class PlayerInstance extends Playable sl.addSkill(transformSkill.getKey(), transformSkill.getValue(), false, false, false); } } + sendPacket(sl); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 76d625704f..21373d8a91 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -9899,6 +9899,7 @@ public class PlayerInstance extends Playable sl.addSkill(s.getDisplayId(), s.getDisplayLevel(), s.isPassive(), isDisabled, isEnchantable); } + if (_transformation != null) { final Map ts = new TreeMap<>(); @@ -9924,11 +9925,14 @@ public class PlayerInstance extends Playable } // Add collection skills. - for (SkillLearn skill : SkillTreeData.getInstance().getCollectSkillTree().values()) + if (_transformation.isFlying()) { - if (getKnownSkill(skill.getSkillId()) != null) + for (SkillLearn skill : SkillTreeData.getInstance().getCollectSkillTree().values()) { - addTransformSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel())); + if ((getKnownSkill(skill.getSkillId()) != null) && (!ts.containsKey(skill.getSkillId()) || (ts.get(skill.getSkillId()) < skill.getSkillLevel()))) + { + ts.put(skill.getSkillId(), skill.getSkillLevel()); + } } } @@ -9939,6 +9943,7 @@ public class PlayerInstance extends Playable sl.addSkill(transformSkill.getKey(), transformSkill.getValue(), false, false, false); } } + sendPacket(sl); }