2
0
Rumen Nikiforov 13 жил өмнө
parent
commit
61e760728d

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2227,7 +2227,7 @@ public abstract class L2Character extends L2Object
 		if (getActiveWeaponItem() != null)
 		{
 			L2Weapon wep = getActiveWeaponItem();
-			if (wep.useWeaponSkillsOnly() && !isGM())
+			if (wep.useWeaponSkillsOnly() && !isGM() && wep.hasSkills())
 			{
 				boolean found = false;
 				for (SkillHolder sh : wep.getSkills())

+ 5 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Item.java

@@ -879,6 +879,11 @@ public abstract class L2Item
 			_preConditions.add(c);
 	}
 	
+	public boolean hasSkills()
+	{
+		return _skillHolder != null;
+	}
+	
 	/**
 	 * Method to retrive skills linked to this item
 	 *

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -2021,7 +2021,7 @@ public final class L2ItemInstance extends L2Object
 	
 	public boolean hasPassiveSkills()
 	{
-		return getItemType() == L2EtcItemType.RUNE && getLocation() == ItemLocation.INVENTORY && getOwnerId() > 0 && getItem().getSkills() != null;
+		return getItemType() == L2EtcItemType.RUNE && getLocation() == ItemLocation.INVENTORY && getOwnerId() > 0 && getItem().hasSkills();
 	}
 	
 	public void giveSkillsToOwner()