From 2037372d84fdb326679affdf3f93829ca881a463 Mon Sep 17 00:00:00 2001 From: Helias Date: Sun, 30 May 2021 17:15:22 +0200 Subject: [PATCH 1/4] chore: fix get guid function --- src/reward_system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reward_system.cpp b/src/reward_system.cpp index 9ca35b3..ae39b78 100644 --- a/src/reward_system.cpp +++ b/src/reward_system.cpp @@ -76,7 +76,7 @@ public: ChatHandler(receiver->GetSession()).PSendSysMessage("You will receive your item in your mailbox"); // format: name "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12] - uint64 receiverGuid = receiver->GetGUID(); + uint64 receiverGuid = receiver->GetGuidValue().GetCounter(); std::string receiverName; std::string subject = "Reward System prize"; From 37e80fedfb3abc58be8a59d0999ba9efb073c993 Mon Sep 17 00:00:00 2001 From: Helias Date: Sun, 30 May 2021 17:26:02 +0200 Subject: [PATCH 2/4] fix: ci --- .github/workflows/core-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/core-build.yml b/.github/workflows/core-build.yml index b793067..b659600 100644 --- a/.github/workflows/core-build.yml +++ b/.github/workflows/core-build.yml @@ -8,8 +8,8 @@ jobs: strategy: fail-fast: false matrix: - compiler: [clang6, clang9, clang10] - runs-on: ubuntu-20.04 + compiler: [clang] + runs-on: ubuntu-latest name: ${{ matrix.compiler }} env: COMPILER: ${{ matrix.compiler }} @@ -42,4 +42,4 @@ jobs: - name: Dry run run: source ./apps/ci/ci-worldserver-dry-run.sh - name: Check startup errors - run: source ./apps/ci/ci-error-check.sh \ No newline at end of file + run: source ./apps/ci/ci-error-check.sh From e14dcb41fee11f736d273224e40f6817302c0aa2 Mon Sep 17 00:00:00 2001 From: Helias Date: Sun, 30 May 2021 18:22:14 +0200 Subject: [PATCH 3/4] fix: build --- src/reward_system.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/reward_system.cpp b/src/reward_system.cpp index ae39b78..a1b79d1 100644 --- a/src/reward_system.cpp +++ b/src/reward_system.cpp @@ -76,7 +76,7 @@ public: ChatHandler(receiver->GetSession()).PSendSysMessage("You will receive your item in your mailbox"); // format: name "subject text" "mail text" item1[:count1] item2[:count2] ... item12[:count12] - uint64 receiverGuid = receiver->GetGuidValue().GetCounter(); + uint64 receiverGuid = receiver->GetGUID().GetCounter(); std::string receiverName; std::string subject = "Reward System prize"; @@ -115,7 +115,7 @@ public: } // from console show not existed sender - MailSender sender(MAIL_NORMAL, receiver->GetSession() ? receiver->GetGUIDLow() : 0, MAIL_STATIONERY_TEST); + MailSender sender(MAIL_NORMAL, receiver->GetSession() ? receiver->GetGUID().GetCounter() : 0, MAIL_STATIONERY_TEST); // fill mail MailDraft draft(subject, text); @@ -131,7 +131,7 @@ public: } } - draft.SendMailTo(trans, MailReceiver(receiver, GUID_LOPART(receiverGuid)), sender); + draft.SendMailTo(trans, MailReceiver(receiver, receiverGuid), sender); CharacterDatabase.CommitTransaction(trans); return; From 427d48fb3de4562f84db4f4d3476e1902cd97a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefano=20Borz=C3=AC?= Date: Sun, 30 May 2021 22:16:31 +0200 Subject: [PATCH 4/4] chore: trigger build --- src/reward_system.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/reward_system.cpp b/src/reward_system.cpp index a1b79d1..2eaecaf 100644 --- a/src/reward_system.cpp +++ b/src/reward_system.cpp @@ -13,6 +13,7 @@ uint32 Max_roll; class reward_system : public PlayerScript { + public: reward_system() : PlayerScript("reward_system") {}