janiii 16 years ago
parent
commit
72180c0495
1 changed files with 2 additions and 2 deletions
  1. 2 2
      L2_GameServer/java/net/sf/l2j/gameserver/model/CursedWeapon.java

+ 2 - 2
L2_GameServer/java/net/sf/l2j/gameserver/model/CursedWeapon.java

@@ -697,11 +697,11 @@ public class CursedWeapon
     {
     	if (player == null) return;
 
-    	if (_isActivated)
+    	if (_isActivated && _player != null)
     	{
     		// Go to player holding the weapon
     		player.teleToLocation(_player.getX(), _player.getY(), _player.getZ() + 20, true);
-    	} else if (_isDropped)
+    	} else if (_isDropped && _item != null)
     	{
     		// Go to item on the ground
     		player.teleToLocation(_item.getX(), _item.getY(), _item.getZ() + 20, true);