Revert "Revert "Fixed PapaJohnBasicAttack""

This reverts commit 41c0d757e86b3ea6668107f4cbf8e06f0aeb0a66.
Revert "Fixed PapaJohnBasicAttack"

This reverts commit a80c7dd10655d6e09bbe73377c56bb2fee454c90.