Fixed shortcut deletion NPE.

2015-11-14 09:49:42 +00:00
parent 9308cefe83
commit 4a8b24c3af
1 changed files with 4 additions and 0 deletions
--- a/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java
+++ b/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java
@ -162,6 +162,10 @@ public class ShortCuts implements IRestorable
 		for (int shotId : _owner.getAutoSoulShot())
 		{
 			L2ItemInstance item = _owner.getInventory().getItemByObjectId(shotId);
+			if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getDefaultAction() == null))
+			{
+				continue;
+			}
 			
 			switch (item.getEtcItem().getDefaultAction())
 			{