update jquery

piqueserver · Jul 25, 2018 · f054046 · f054046
1 parent 5ec2f51
commit f054046
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/piqueserver/scripts/aimbot2.py b/piqueserver/scripts/aimbot2.py
@@ -27,8 +27,6 @@
 KILLS_IN_TIME = WARN_ADMIN
 MULTIPLE_BULLETS = WARN_ADMIN
 
-DETECT_DAMAGE_HACK = True
-
 # Minimum amount of time that must pass between admin warnings that are
 # triggered by the same detection method. Time is in seconds.
 WARN_INTERVAL_MINIMUM = 300
@@ -381,18 +379,12 @@ def on_hit(self, hit_amount, hit_player, hit_type, grenade):
                         self.multiple_bullets_eject()
                         return False
             elif self.weapon == SMG_WEAPON:
-                if not (hit_amount in SMG_DAMAGE) and DETECT_DAMAGE_HACK:
+                self.smg_hits += 1
+                if self.multiple_bullets_count >= SMG_MULTIPLE_BULLETS_MAX:
+                    self.multiple_bullets_eject()
                     return False
-                else:
-                    self.smg_hits += 1
-                    if self.multiple_bullets_count >= SMG_MULTIPLE_BULLETS_MAX:
-                        self.multiple_bullets_eject()
-                        return False
             elif self.weapon == SHOTGUN_WEAPON:
-                if not (hit_amount in SHOTGUN_DAMAGE) and DETECT_DAMAGE_HACK:
-                    return False
-                elif shotgun_use:
-                    self.shotgun_hits += 1
+                self.shotgun_hits += 1
 
             return connection.on_hit(
                 self, hit_amount, hit_player, hit_type, grenade)

diff --git a/piqueserver/web/templates/status.html b/piqueserver/web/templates/status.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <title>{{server.name}}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+        <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha384-tsQFqpEReu7ZLhBV2VZlAu7zcOV+rXbYlF2cqB8txI/8aZajjp4Bqd+V6D5IgvKT" crossorigin="anonymous"></script>
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap-theme.min.css">
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>