Merge remote-tracking branch 'upstream/master' into sound-lib

.github/workflows/GLuaLint.yml

@@ -0,0 +1,17 @@
+name: GLuaLint
+
+on:
+  push:
+    paths:
+    - 'lua/**'
+    - '!lua/entities/gmod_wire_expression2/**'
+  pull_request:
+    paths:
+    - 'lua/**'
+    - '!lua/entities/gmod_wire_expression2/**'
+
+jobs:
+  Lint:
+    uses: FPtje/GLuaFixer/.github/workflows/glualint.yml@master
+    with:
+      config: "./.glualint.json"

.glualint.json

@@ -17,7 +17,7 @@
     "lint_unusedVars":                  true,
     "lint_unusedParameters":            true,
     "lint_unusedLoopVars":              true,
-    "lint_ignoreFiles":                 [],
+    "lint_ignoreFiles":                 ["lua/entities/gmod_wire_expression2/core/custom/*.lua"],
 
     "prettyprint_spaceAfterParens":     false,
     "prettyprint_spaceAfterBrackets":   false,
@@ -30,4 +30,4 @@
     "prettyprint_rejectInvalidCode":    false,
     "prettyprint_indentation":          "\t",
     "log_format":                       "auto"
-}
+}

README.md

@@ -3,7 +3,7 @@
 
 [![Discord Invite](https://img.shields.io/discord/654142834030542878?label=Chat&style=flat-square)](https://discord.gg/jgdzysxjST)
 [![Steam Group](https://img.shields.io/badge/ACF%20Official-Join%20Now!-informational?style=flat-square)](https://steamcommunity.com/groups/officialacf)
-[![Linting Status](https://img.shields.io/github/actions/workflow/status/Stooberton/ACF-3/GLuaFixer.yml?branch=master&label=Linter%20Status&style=flat-square)](https://github.com/Stooberton/ACF-3/actions?query=workflow%3AGLuaFixer)
+[![Linting Status](https://img.shields.io/github/actions/workflow/status/Stooberton/ACF-3/GLuaLint.yml?branch=master&label=Linter%20Status&style=flat-square)](https://github.com/Stooberton/ACF-3/actions?query=workflow%3AGLuaLint)
 [![Test Suite](https://img.shields.io/github/actions/workflow/status/Stooberton/ACF-3/gluatest.yml?branch=master&label=Test%20Suite&style=flat-square)](https://github.com/CFC-Servers/GLuaTest)
 [![Repository Size](https://img.shields.io/github/repo-size/Stooberton/ACF-3?label=Repository%20Size&style=flat-square)](https://github.com/Stooberton/ACF-3)
 [![Commit Activity](https://img.shields.io/github/commit-activity/m/Stooberton/ACF-3?label=Commit%20Activity&style=flat-square)](https://github.com/Stooberton/ACF-3/graphs/commit-activity)

lua/acf/ballistics/ballistics_sv.lua

@@ -315,7 +315,7 @@ do -- Terminal ballistics --------------------------
 			)
 		end
 
-		if HitRes.Kill then
+		if HitRes.Kill and IsValid(Entity) then
 			ACF.APKill(Entity, Bullet.Flight:GetNormalized(), Energy.Kinetic, DmgInfo)
 		end