Don't keep a reference to the Player
Update to newer craftbukkit
(and a little CraftBukkitUtils pedantry)