From 8470e31b01d4b66e6374258e9720ce9dcc3ebf9f Mon Sep 17 00:00:00 2001 From: locus313 Date: Fri, 16 Oct 2020 23:32:11 -0700 Subject: [PATCH 1/6] update LGF_Solo.cpp to work on docker --- src/Lfg_Solo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Lfg_Solo.cpp b/src/Lfg_Solo.cpp index ee5f70e..ea035bf 100644 --- a/src/Lfg_Solo.cpp +++ b/src/Lfg_Solo.cpp @@ -20,7 +20,7 @@ public: lfg_solo_announce() : PlayerScript("lfg_solo_announce") {} - void OnLogin(Player* player) + void OnLogin(Player* __attribute__ ((unused))player) { // Announce Module if (sConfigMgr->GetBoolDefault("SoloLFG.Announce", true)) @@ -37,7 +37,7 @@ public: // Docker Installation prevents warnings. In order to avoid the issue, we need to add __attribute__ ((unused)) // to the player variable to tell the compiler it is fine not to use it. - void OnLogin(Player* player) + void OnLogin(Player* __attribute__ ((unused))player) { if (sConfigMgr->GetIntDefault("SoloLFG.Enable", true)) { From b682d84af73654a9c99b523b0e109c871c97c49e Mon Sep 17 00:00:00 2001 From: locus313 Date: Fri, 16 Oct 2020 23:34:58 -0700 Subject: [PATCH 2/6] Revert "update LGF_Solo.cpp to work on docker" This reverts commit 8470e31b01d4b66e6374258e9720ce9dcc3ebf9f. --- src/Lfg_Solo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Lfg_Solo.cpp b/src/Lfg_Solo.cpp index ea035bf..ee5f70e 100644 --- a/src/Lfg_Solo.cpp +++ b/src/Lfg_Solo.cpp @@ -20,7 +20,7 @@ public: lfg_solo_announce() : PlayerScript("lfg_solo_announce") {} - void OnLogin(Player* __attribute__ ((unused))player) + void OnLogin(Player* player) { // Announce Module if (sConfigMgr->GetBoolDefault("SoloLFG.Announce", true)) @@ -37,7 +37,7 @@ public: // Docker Installation prevents warnings. In order to avoid the issue, we need to add __attribute__ ((unused)) // to the player variable to tell the compiler it is fine not to use it. - void OnLogin(Player* __attribute__ ((unused))player) + void OnLogin(Player* player) { if (sConfigMgr->GetIntDefault("SoloLFG.Enable", true)) { From 2a8a637ba4d53ae26e344e3115d2b00a9614857e Mon Sep 17 00:00:00 2001 From: locus313 Date: Fri, 16 Oct 2020 23:35:13 -0700 Subject: [PATCH 3/6] add docker.patch --- docker.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docker.patch diff --git a/docker.patch b/docker.patch new file mode 100644 index 0000000..940eabd --- /dev/null +++ b/docker.patch @@ -0,0 +1,25 @@ +diff --git a/src/Lfg_Solo.cpp b/src/Lfg_Solo.cpp +index ee5f70e..ea035bf 100644 +--- a/src/Lfg_Solo.cpp ++++ b/src/Lfg_Solo.cpp +@@ -20,7 +20,7 @@ public: + + lfg_solo_announce() : PlayerScript("lfg_solo_announce") {} + +- void OnLogin(Player* player) ++ void OnLogin(Player* __attribute__ ((unused))player) + { + // Announce Module + if (sConfigMgr->GetBoolDefault("SoloLFG.Announce", true)) +@@ -37,7 +37,7 @@ public: + + // Docker Installation prevents warnings. In order to avoid the issue, we need to add __attribute__ ((unused)) + // to the player variable to tell the compiler it is fine not to use it. +- void OnLogin(Player* player) ++ void OnLogin(Player* __attribute__ ((unused))player) + { + if (sConfigMgr->GetIntDefault("SoloLFG.Enable", true)) + { +-- +1.8.3.1 + From 30c22408445f494f8640a74113e539c2af365924 Mon Sep 17 00:00:00 2001 From: locus313 Date: Sat, 17 Oct 2020 01:46:38 -0700 Subject: [PATCH 4/6] update docker installation directions --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 47ef8e6..df90da4 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,15 @@ Allows for players to use dungeon finder solo or in groups less than and up to 5 ## Docker Installation ``` 1. Go inside your /modules/ folder -2. git clone https://github.com/milestorme/mod-solo-lfg.git +2. git clone https://github.com/azerothcore/mod-solo-lfg.git 3. Apply lfg-solo.patch to your core. a. In order to do this, please go to the root /azerothcore-wotlk of your installation. - b. Then do git apply modules/mod-solo-lfg/lfg-solo.patch + b. Then do 'git apply modules/mod-solo-lfg/lfg-solo.patch' (make sure the path is indeed pointing to your lfg-solo.patch file) -4. Go to src/Lfg_solo.cpp and replace line 24 with ``` void OnLogin(Player* __attribute__ ((unused))player)``` save file. +4. Apply lfg-solo.patch to your core. + a. In order to do this, please go to the mod-solo-lfg module directory 'modules/mod-solo-lfg'. + b. Then do 'git apply docker.patch' + (make sure the path is indeed pointing to your docker.patch file) 5. Re-run cmake and launch a clean build of AzerothCore. a. Go to your root folder and ./bin/acore-docker-build b. Then do a docker-compose up From 49ce45f2dbb9d3a8d5ffc9a81d17cd59933d7392 Mon Sep 17 00:00:00 2001 From: locus313 Date: Sat, 17 Oct 2020 01:48:31 -0700 Subject: [PATCH 5/6] remove space --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df90da4..92ba775 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ copy the file SoloLfg.conf.dist to SoloLfg.conf and edit it (keep both files). ## Docker Uninstallation ``` 1. Remove the /modules/mod-solo-lfg folder -2. Remove the lfg-solo.patch from y our core. +2. Remove the lfg-solo.patch from your core. a. In order to do this, please go to the root /azerothcore-wotlk of your installation. b. Then do git apply -R modules/mod-solo-lfg/lfg-solo.patch 3. Re-run cmake and launch a clean build of AzerothCore. From 709bce563acd3ea27da1fbe9c44a17cd0b538e15 Mon Sep 17 00:00:00 2001 From: Patrick Lewis Date: Sat, 17 Oct 2020 14:24:42 -0700 Subject: [PATCH 6/6] fix indentation --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92ba775..4a5267c 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Allows for players to use dungeon finder solo or in groups less than and up to 5 (make sure the path is indeed pointing to your lfg-solo.patch file) 4. Apply lfg-solo.patch to your core. a. In order to do this, please go to the mod-solo-lfg module directory 'modules/mod-solo-lfg'. - b. Then do 'git apply docker.patch' - (make sure the path is indeed pointing to your docker.patch file) + b. Then do 'git apply docker.patch' + (make sure the path is indeed pointing to your docker.patch file) 5. Re-run cmake and launch a clean build of AzerothCore. a. Go to your root folder and ./bin/acore-docker-build b. Then do a docker-compose up