From 4a8b24c3afff71206fd483bd05f918dbe949225f Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 14 Nov 2015 09:49:42 +0000
Subject: [PATCH] Fixed shortcut deletion NPE.

---
 trunk/java/com/l2jserver/gameserver/model/ShortCuts.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java b/trunk/java/com/l2jserver/gameserver/model/ShortCuts.java
index 6dab092c62..5a30e46624 100644
--- 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())
 			{