@@ -943,28 +943,28 @@ |
||
| 943 | 943 | $inmap_pkms_filter = ""; |
| 944 | 944 | $where = " WHERE disappear_time >= UTC_TIMESTAMP() AND pokemon_id = ".$pokemon_id; |
| 945 | 945 | |
| 946 | - if (isset($_POST['inmap_pokemons']) && ($_POST['inmap_pokemons'] != "")) { |
|
| 947 | - foreach ($_POST['inmap_pokemons'] as $inmap) { |
|
| 948 | - $inmap_pkms_filter .= "'".$inmap."',"; |
|
| 949 | - } |
|
| 950 | - $inmap_pkms_filter = rtrim($inmap_pkms_filter, ","); |
|
| 951 | - $where .= " AND encounter_id NOT IN (".$inmap_pkms_filter.") "; |
|
| 952 | - } |
|
| 953 | - |
|
| 954 | - if ($config->system->live_show_encounter_stats) { |
|
| 955 | - $reqTestIv = "SELECT MAX(individual_attack) AS iv FROM pokemon ".$where; |
|
| 956 | - $resultTestIv = $mysqli->query($reqTestIv); |
|
| 957 | - $testIv = $resultTestIv->fetch_object(); |
|
| 946 | + if (isset($_POST['inmap_pokemons']) && ($_POST['inmap_pokemons'] != "")) { |
|
| 947 | + foreach ($_POST['inmap_pokemons'] as $inmap) { |
|
| 948 | + $inmap_pkms_filter .= "'".$inmap."',"; |
|
| 949 | + } |
|
| 950 | + $inmap_pkms_filter = rtrim($inmap_pkms_filter, ","); |
|
| 951 | + $where .= " AND encounter_id NOT IN (".$inmap_pkms_filter.") "; |
|
| 952 | + } |
|
| 953 | + |
|
| 954 | + if ($config->system->live_show_encounter_stats) { |
|
| 955 | + $reqTestIv = "SELECT MAX(individual_attack) AS iv FROM pokemon ".$where; |
|
| 956 | + $resultTestIv = $mysqli->query($reqTestIv); |
|
| 957 | + $testIv = $resultTestIv->fetch_object(); |
|
| 958 | 958 | |
| 959 | - if ($testIv->iv != null && isset($_POST['ivMin']) && ($_POST['ivMin'] != "")) { |
|
| 960 | - $ivMin = mysqli_real_escape_string($mysqli, $_POST['ivMin']); |
|
| 961 | - $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) >= (".$ivMin.") "; |
|
| 962 | - } |
|
| 963 | - if ($testIv->iv != null && isset($_POST['ivMax']) && ($_POST['ivMax'] != "")) { |
|
| 964 | - $ivMax = mysqli_real_escape_string($mysqli, $_POST['ivMax']); |
|
| 965 | - $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <=(".$ivMax.") "; |
|
| 966 | - } |
|
| 967 | - } |
|
| 959 | + if ($testIv->iv != null && isset($_POST['ivMin']) && ($_POST['ivMin'] != "")) { |
|
| 960 | + $ivMin = mysqli_real_escape_string($mysqli, $_POST['ivMin']); |
|
| 961 | + $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) >= (".$ivMin.") "; |
|
| 962 | + } |
|
| 963 | + if ($testIv->iv != null && isset($_POST['ivMax']) && ($_POST['ivMax'] != "")) { |
|
| 964 | + $ivMax = mysqli_real_escape_string($mysqli, $_POST['ivMax']); |
|
| 965 | + $where .= " AND ((100/45)*(individual_attack+individual_defense+individual_stamina)) <=(".$ivMax.") "; |
|
| 966 | + } |
|
| 967 | + } |
|
| 968 | 968 | |
| 969 | 969 | $req = "SELECT pokemon_id, encounter_id, latitude, longitude, disappear_time, |
| 970 | 970 | (CONVERT_TZ(disappear_time, '+00:00', '".$time_offset."')) AS disappear_time_real, |