From 4b0ffc3bd434ee9b7affca93acddaee7f8c95ae4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment Date: Wed, 17 Apr 2024 00:30:56 +0300 Subject: [PATCH] Fixed giveSkillsToOwner template hasSkills NPE. --- .../org/l2jmobius/gameserver/model/item/instance/Item.java | 5 +++++ .../org/l2jmobius/gameserver/model/item/instance/Item.java | 5 +++++ .../org/l2jmobius/gameserver/model/item/instance/Item.java | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java index d4ea6d8391..18fb948899 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -1742,6 +1742,11 @@ public class Item extends WorldObject public void giveSkillsToOwner() { + if (!_itemTemplate.hasSkills()) + { + return; + } + if (!isEquipped() && !hasPassiveSkills()) { return; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java index d11e0a04e5..016e46771b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -1997,6 +1997,11 @@ public class Item extends WorldObject public void giveSkillsToOwner() { + if (!_itemTemplate.hasSkills()) + { + return; + } + if (!isEquipped() && !hasPassiveSkills()) { return; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java index fb47210cb9..b47a4e7143 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -1997,6 +1997,11 @@ public class Item extends WorldObject public void giveSkillsToOwner() { + if (!_itemTemplate.hasSkills()) + { + return; + } + if (!isEquipped() && !hasPassiveSkills()) { return;