From a95e0397b05417c9d42126268103d2682fdb17ba Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Wed, 26 Jul 2023 15:15:42 +0200 Subject: [PATCH 1/6] Add new or update workflow --- .github/workflows/main.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b75c6ea4..48f0f44f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,8 +4,8 @@ on: issues: types: - opened - pull_request: - types: + pull_request_target: + types: - opened jobs: @@ -15,14 +15,9 @@ jobs: steps: - name: Check out code uses: actions/checkout@v3 - - name: Get event creation date + - name: Get current date id: date - run: | - if [[ "${{ github.event_name }}" == "issues" ]]; then - echo "date=${{ github.event.issue.created_at }}" >> $GITHUB_ENV - elif [[ "${{ github.event_name }}" == "pull_request" ]]; then - echo "date=${{ github.event.pull_request.created_at }}" >> $GITHUB_ENV - fi + run: echo "date=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_ENV - name: Add to project uses: actions/add-to-project@v0.5.0 with: @@ -35,5 +30,5 @@ jobs: project-url: https://github.com/orgs/esx-framework/projects/9 github-token: ${{ secrets.MY_GITHUB_TOKEN }} item-id: ${{ steps.add-project.outputs.itemId }} - field-keys: Date - field-values: ${{ env.date }}, \ No newline at end of file + field-keys: Date,Priority + field-values: ${{ env.date }},Unrealised \ No newline at end of file From df93efb778759f5c5b45d54b30ed37cfe212b820 Mon Sep 17 00:00:00 2001 From: Katoteki <58405477+katotekii@users.noreply.github.com> Date: Wed, 26 Jul 2023 21:35:39 +0200 Subject: [PATCH 2/6] Update player.lua fix for `subValue` arg in `setMeta` function --- [core]/es_extended/server/classes/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 62c12cf1..44b0dfc1 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -642,7 +642,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, if _type ~= "string" then return print(("[^1ERROR^7] xPlayer.setMeta ^5value^7 should be ^5string^7 as a subIndex!"):format(value)) end - + self.metadata[index] = table.create(0, 0) self.metadata[index][value] = subValue end From d67a32ad92f62710f26757184a824ffa093ed093 Mon Sep 17 00:00:00 2001 From: Katoteki <58405477+katotekii@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:17:28 +0200 Subject: [PATCH 3/6] Update player.lua --- [core]/es_extended/server/classes/player.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index 44b0dfc1..c9d5e8f4 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -642,7 +642,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, if _type ~= "string" then return print(("[^1ERROR^7] xPlayer.setMeta ^5value^7 should be ^5string^7 as a subIndex!"):format(value)) end - self.metadata[index] = table.create(0, 0) + + if not self.metadata[index] then + self.metadata[index] = table.create(0, 0) + end + self.metadata[index][value] = subValue end From b114c7e998d51bda000a4858742ffe541a8f2a2e Mon Sep 17 00:00:00 2001 From: Katoteki <58405477+katotekii@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:19:12 +0200 Subject: [PATCH 4/6] Update player.lua --- [core]/es_extended/server/classes/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index c9d5e8f4..ec836080 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -617,7 +617,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, return metaData end - function self.setMeta(index, value, subValue) + function self.(index, value, subValue) if not index then return print("[^1ERROR^7] xPlayer.setMeta ^5index^7 is Missing!") end From 3ac80fe21837947419caa993dc5c88df76ad2f65 Mon Sep 17 00:00:00 2001 From: Katoteki <58405477+katotekii@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:24:29 +0200 Subject: [PATCH 5/6] Update player.lua idk what happened, now good --- [core]/es_extended/server/classes/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index ec836080..c9d5e8f4 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -617,7 +617,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, return metaData end - function self.(index, value, subValue) + function self.setMeta(index, value, subValue) if not index then return print("[^1ERROR^7] xPlayer.setMeta ^5index^7 is Missing!") end From b5c0d30c9fc5ee616edf95ba14d1d25fb2877e38 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Thu, 17 Aug 2023 23:40:25 +0200 Subject: [PATCH 6/6] :ambulance: Fix setMeta subValue --- [core]/es_extended/server/classes/player.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/[core]/es_extended/server/classes/player.lua b/[core]/es_extended/server/classes/player.lua index c9d5e8f4..e4601ad6 100644 --- a/[core]/es_extended/server/classes/player.lua +++ b/[core]/es_extended/server/classes/player.lua @@ -462,7 +462,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, function self.removeWeapon(weaponName) local weaponLabel, playerPed = nil, GetPlayerPed(self.source) - if not playerPed then + if not playerPed then return print("[^1ERROR^7] xPlayer.removeWeapon ^5invalid^7 player ped!") end @@ -473,7 +473,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, for _, v2 in ipairs(v.components) do self.removeWeaponComponent(weaponName, v2) end - + local weaponHash = joaat(v.name) RemoveWeaponFromPed(playerPed, weaponHash) @@ -642,11 +642,11 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, if _type ~= "string" then return print(("[^1ERROR^7] xPlayer.setMeta ^5value^7 should be ^5string^7 as a subIndex!"):format(value)) end - - if not self.metadata[index] then - self.metadata[index] = table.create(0, 0) + + if not self.metadata[index] or type(self.metadata[index]) ~= "table" then + self.metadata[index] = { } end - + self.metadata[index][value] = subValue end