Added partial PVP protection.
Added bucket fill/empty protection.