Fixed shield sound
Fixed nullpointer in NetServerHandler
Fixed class cast exception in EntityTrackerEntry
Merge remote-tracking branch 'upstream/master'