[fixed] Themepark logic stability issues
[fixed] Escort mobile incorrect pvp bitmask

Change-Id: Idf879b29690da83d21e330c31cbe97ec9477fbe6