diff --git a/.github/workflows/GLuaFixer.yml b/.github/workflows/GLuaFixer.yml deleted file mode 100644 index cceddf204..000000000 --- a/.github/workflows/GLuaFixer.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: GLuaFixer - -on: - push: - paths: - - 'lua/**' - - '!lua/entities/gmod_wire_expression2/**' - pull_request: - paths: - - 'lua/**' - - '!lua/entities/gmod_wire_expression2/**' - -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Download GLuaFixer 1.17.2 - run: curl -o glualint.zip -L https://github.com/FPtje/GLuaFixer/releases/download/1.17.2/glualint-1.17.2-linux-stripped.zip - - name: Extract glualint.zip - run: unzip glualint.zip - - name: Remove blacklisted folders - run: rm -r lua/entities/gmod_wire_expression2/ - - name: Initiate linting - run: ./glualint --output-format github lint . diff --git a/.github/workflows/GLuaLint.yml b/.github/workflows/GLuaLint.yml new file mode 100644 index 000000000..6c6f0df5f --- /dev/null +++ b/.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" \ No newline at end of file diff --git a/lua/acf/ballistics/ballistics_sv.lua b/lua/acf/ballistics/ballistics_sv.lua index 3e7c15ecf..f0531ada2 100644 --- a/lua/acf/ballistics/ballistics_sv.lua +++ b/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