yolinlin/mod-solo-lfg
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-solo-lfg synced 2025-11-29 15:58:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from locus313/docker-patch

Browse Source 
feat(patch): changes required for docker
This commit is contained in:
Stefano Borzì
2020-10-18 01:31:22 +02:00
committed by GitHub
parent 2cf159f963 709bce563a
commit e5c6337a87
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@@ -17,12 +17,15 @@ Allows for players to use dungeon finder solo or in groups less than and up to 5
## Docker Installation ## Docker Installation
``` ```
1. Go inside your /modules/ folder 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. 3. Apply lfg-solo.patch to your core.
a. In order to do this, please go to the root /azerothcore-wotlk of your installation. 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) (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. 5. Re-run cmake and launch a clean build of AzerothCore.
a. Go to your root folder and ./bin/acore-docker-build a. Go to your root folder and ./bin/acore-docker-build
b. Then do a docker-compose up b. Then do a docker-compose up
@@ -44,7 +47,7 @@ copy the file SoloLfg.conf.dist to SoloLfg.conf and edit it (keep both files).
## Docker Uninstallation ## Docker Uninstallation
``` ```
1. Remove the /modules/mod-solo-lfg folder 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. 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 b. Then do git apply -R modules/mod-solo-lfg/lfg-solo.patch
3. Re-run cmake and launch a clean build of AzerothCore. 3. Re-run cmake and launch a clean build of AzerothCore.

25
docker.patch Normal file
View File

@@ -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