Bugfixes

NullPointerException on enable,
breaking fire with sword.