Fix NPE when interacting with no heldItem

Signed-off-by: Jack Huey kitskub@gmail.com
Update for API changes

Signed-off-by: Jack Huey kitskub@gmail.com