mirror of
https://github.com/uprightbass360/AzerothCore-RealmMaster.git
synced 2026-01-27 15:36:23 +00:00
Compare commits
1 Commits
c0aaf8ce96
...
feat/varia
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9960444425 |
@@ -556,5 +556,3 @@ MODULE_MOD_MATERIAL_BANK=0
|
|||||||
MODULE_MOD_PROGRESSION_BLIZZLIKE=0
|
MODULE_MOD_PROGRESSION_BLIZZLIKE=0
|
||||||
MODULE_MOD_PYTHON_ENGINE=0
|
MODULE_MOD_PYTHON_ENGINE=0
|
||||||
MODULE_WRATH_OF_THE_VANILLA_V2=0
|
MODULE_WRATH_OF_THE_VANILLA_V2=0
|
||||||
MODULE_DUELS=0
|
|
||||||
MODULE_WOW_CORE=0
|
|
||||||
|
|||||||
42
.gitignore
vendored
42
.gitignore
vendored
@@ -1,27 +1,25 @@
|
|||||||
# ===================================
|
database-import/*.sql
|
||||||
# Environment & Configuration
|
database-import/*.sql.gz
|
||||||
# ===================================
|
database-import/*/
|
||||||
.env
|
database-import/ImportBackup*/
|
||||||
.claude/
|
db_*/
|
||||||
.mcp*/
|
source/*
|
||||||
|
local-data-tools/
|
||||||
# ===================================
|
changelogs/
|
||||||
# Storage & Data Directories
|
|
||||||
# ===================================
|
|
||||||
storage/
|
storage/
|
||||||
local-storage/
|
local-storage/
|
||||||
db_*/
|
.claude/
|
||||||
|
images/
|
||||||
# ===================================
|
node_modules/
|
||||||
# Build Artifacts & Cache
|
.mcp*/
|
||||||
# ===================================
|
|
||||||
.gocache/
|
|
||||||
statusdash
|
|
||||||
scripts/__pycache__/*
|
scripts/__pycache__/*
|
||||||
scripts/bash/__pycache__/*
|
scripts/bash/__pycache__/*
|
||||||
scripts/python/__pycache__/*
|
scripts/python/__pycache__/*
|
||||||
|
.env
|
||||||
# ===================================
|
package-lock.json
|
||||||
# Logs & Runtime State
|
package.json
|
||||||
# ===================================
|
todo.md
|
||||||
deploy.log
|
.gocache/
|
||||||
|
.module-ledger/
|
||||||
|
deploy.log
|
||||||
|
statusdash
|
||||||
14
build.sh
14
build.sh
@@ -38,7 +38,6 @@ Build AzerothCore with custom modules and create deployment-ready images.
|
|||||||
Options:
|
Options:
|
||||||
--yes, -y Auto-confirm all prompts
|
--yes, -y Auto-confirm all prompts
|
||||||
--force Force rebuild even if no changes detected
|
--force Force rebuild even if no changes detected
|
||||||
--force-update Force update source repository to latest commits
|
|
||||||
--source-path PATH Custom source repository path
|
--source-path PATH Custom source repository path
|
||||||
--skip-source-setup Skip automatic source repository setup
|
--skip-source-setup Skip automatic source repository setup
|
||||||
-h, --help Show this help
|
-h, --help Show this help
|
||||||
@@ -54,7 +53,6 @@ Examples:
|
|||||||
./build.sh Interactive build
|
./build.sh Interactive build
|
||||||
./build.sh --yes Auto-confirm build
|
./build.sh --yes Auto-confirm build
|
||||||
./build.sh --force Force rebuild regardless of state
|
./build.sh --force Force rebuild regardless of state
|
||||||
./build.sh --force-update Update source to latest and build
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +60,6 @@ while [[ $# -gt 0 ]]; do
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
--yes|-y) ASSUME_YES=1; shift;;
|
--yes|-y) ASSUME_YES=1; shift;;
|
||||||
--force) FORCE_REBUILD=1; shift;;
|
--force) FORCE_REBUILD=1; shift;;
|
||||||
--force-update) FORCE_UPDATE=1; shift;;
|
|
||||||
--source-path) CUSTOM_SOURCE_PATH="$2"; shift 2;;
|
--source-path) CUSTOM_SOURCE_PATH="$2"; shift 2;;
|
||||||
--skip-source-setup) SKIP_SOURCE_SETUP=1; shift;;
|
--skip-source-setup) SKIP_SOURCE_SETUP=1; shift;;
|
||||||
-h|--help) usage; exit 0;;
|
-h|--help) usage; exit 0;;
|
||||||
@@ -243,13 +240,6 @@ ensure_source_repo(){
|
|||||||
src_path="${src_path//\/.\//\/}"
|
src_path="${src_path//\/.\//\/}"
|
||||||
|
|
||||||
if [ -d "$src_path/.git" ]; then
|
if [ -d "$src_path/.git" ]; then
|
||||||
if [ "${FORCE_UPDATE:-0}" = "1" ]; then
|
|
||||||
info "Force update requested - updating source repository to latest" >&2
|
|
||||||
if ! (cd "$ROOT_DIR" && ./scripts/bash/setup-source.sh) >&2; then
|
|
||||||
err "Failed to update source repository" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
echo "$src_path"
|
echo "$src_path"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
@@ -550,10 +540,6 @@ stage_modules(){
|
|||||||
rm -f "$staging_modules_dir/.modules_state" "$staging_modules_dir/.requires_rebuild" 2>/dev/null || true
|
rm -f "$staging_modules_dir/.modules_state" "$staging_modules_dir/.requires_rebuild" 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Export environment variables needed by module hooks
|
|
||||||
export STACK_SOURCE_VARIANT="$(read_env STACK_SOURCE_VARIANT "core")"
|
|
||||||
export MODULES_REBUILD_SOURCE_PATH="$(read_env MODULES_REBUILD_SOURCE_PATH "")"
|
|
||||||
|
|
||||||
if ! (cd "$local_modules_dir" && bash "$ROOT_DIR/scripts/bash/manage-modules.sh"); then
|
if ! (cd "$local_modules_dir" && bash "$ROOT_DIR/scripts/bash/manage-modules.sh"); then
|
||||||
err "Module staging failed; aborting build"
|
err "Module staging failed; aborting build"
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -5489,34 +5489,6 @@
|
|||||||
"requires": [],
|
"requires": [],
|
||||||
"post_install_hooks": [],
|
"post_install_hooks": [],
|
||||||
"config_cleanup": []
|
"config_cleanup": []
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "MODULE_DUELS",
|
|
||||||
"name": "Duels",
|
|
||||||
"repo": "https://github.com/VikasMahajan370/Duels.git",
|
|
||||||
"description": "\u2694\ufe0f Experience engaging duels with a feature-rich plugin for Paper 1.21+ servers, featuring 1.8 Legacy combat, matchmaking, custom kits, and more.",
|
|
||||||
"type": "cpp",
|
|
||||||
"category": "uncategorized",
|
|
||||||
"notes": "Discovered via GitHub topic 'azerothcore-module'",
|
|
||||||
"status": "active",
|
|
||||||
"order": 5000,
|
|
||||||
"requires": [],
|
|
||||||
"post_install_hooks": [],
|
|
||||||
"config_cleanup": []
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "MODULE_WOW_CORE",
|
|
||||||
"name": "wow-core",
|
|
||||||
"repo": "https://github.com/Wow-Libre/wow-core.git",
|
|
||||||
"description": "Complete management platform for private World of Warcraft servers.",
|
|
||||||
"type": "tool",
|
|
||||||
"category": "tooling",
|
|
||||||
"notes": "Discovered via GitHub topic 'azerothcore-tools'",
|
|
||||||
"status": "active",
|
|
||||||
"order": 5000,
|
|
||||||
"requires": [],
|
|
||||||
"post_install_hooks": [],
|
|
||||||
"config_cleanup": []
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
"MODULE_ASSISTANT",
|
"MODULE_ASSISTANT",
|
||||||
"MODULE_REAGENT_BANK",
|
"MODULE_REAGENT_BANK",
|
||||||
"MODULE_BLACK_MARKET_AUCTION_HOUSE",
|
"MODULE_BLACK_MARKET_AUCTION_HOUSE",
|
||||||
|
"MODULE_ELUNA_TS",
|
||||||
"MODULE_ELUNA",
|
"MODULE_ELUNA",
|
||||||
"MODULE_AIO",
|
"MODULE_AIO",
|
||||||
"MODULE_ELUNA_SCRIPTS",
|
"MODULE_ELUNA_SCRIPTS",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"modules": [
|
"modules": [
|
||||||
"MODULE_ELUNA"
|
|
||||||
],
|
],
|
||||||
"label": "\ud83d\udd30 AzerothCore Main - Mod Free",
|
"label": "\ud83d\udd30 AzerothCore Main - Mod Free",
|
||||||
"description": "Pure AzerothCore with no optional modules enabled",
|
"description": "Pure AzerothCore with no optional modules enabled",
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
{
|
{
|
||||||
"modules": [
|
"modules": [
|
||||||
"MODULE_PLAYERBOTS",
|
"MODULE_PLAYERBOTS",
|
||||||
"MODULE_ELUNA"
|
"MODULE_ELUNA",
|
||||||
|
"MODULE_ELUNA_TS"
|
||||||
],
|
],
|
||||||
"label": "\ud83e\udde9 Playerbots Only",
|
"label": "\ud83e\udde9 Playerbots Only",
|
||||||
"description": "Minimal preset that only enables playerbot prerequisites",
|
"description": "Minimal preset that only enables playerbot prerequisites",
|
||||||
|
|||||||
@@ -8,10 +8,11 @@
|
|||||||
"MODULE_NPC_BUFFER",
|
"MODULE_NPC_BUFFER",
|
||||||
"MODULE_LEARN_SPELLS",
|
"MODULE_LEARN_SPELLS",
|
||||||
"MODULE_FIREWORKS",
|
"MODULE_FIREWORKS",
|
||||||
|
"MODULE_ELUNA_TS",
|
||||||
"MODULE_ELUNA",
|
"MODULE_ELUNA",
|
||||||
"MODULE_AIO"
|
"MODULE_AIO"
|
||||||
],
|
],
|
||||||
"label": "\ud83e\udd16 Suggested modules (Playerbots)",
|
"label": "\ud83e\udd16 Playerbots + Suggested modules",
|
||||||
"description": "Suggested stack plus playerbots enabled",
|
"description": "Suggested stack plus playerbots enabled",
|
||||||
"order": 1
|
"order": 1
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"modules": [
|
"modules": [
|
||||||
|
"MODULE_ELUNA_TS",
|
||||||
"MODULE_ELUNA",
|
"MODULE_ELUNA",
|
||||||
"MODULE_AIO",
|
"MODULE_AIO",
|
||||||
"MODULE_SOLO_LFG",
|
"MODULE_SOLO_LFG",
|
||||||
@@ -10,7 +11,7 @@
|
|||||||
"MODULE_LEARN_SPELLS",
|
"MODULE_LEARN_SPELLS",
|
||||||
"MODULE_FIREWORKS"
|
"MODULE_FIREWORKS"
|
||||||
],
|
],
|
||||||
"label": "\u2b50 Suggested Modules (Main)",
|
"label": "\u2b50 Suggested Modules",
|
||||||
"description": "Baseline solo-friendly quality of life mix (no playerbots)",
|
"description": "Baseline solo-friendly quality of life mix (no playerbots)",
|
||||||
"order": 2
|
"order": 2
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ storage/
|
|||||||
├── client-data/ # Unpacked WoW client data & DBC overrides
|
├── client-data/ # Unpacked WoW client data & DBC overrides
|
||||||
├── logs/ # Server log files
|
├── logs/ # Server log files
|
||||||
├── modules/ # Downloaded module source code
|
├── modules/ # Downloaded module source code
|
||||||
├── lua_scripts/ # ALE Lua scripts (auto-loaded)
|
├── lua_scripts/ # Eluna Lua scripts (auto-loaded)
|
||||||
├── install-markers/ # Module installation state tracking
|
├── install-markers/ # Module installation state tracking
|
||||||
└── backups/ # Automated database backups
|
└── backups/ # Automated database backups
|
||||||
├── daily/ # Daily backups (retained per BACKUP_RETENTION_DAYS)
|
├── daily/ # Daily backups (retained per BACKUP_RETENTION_DAYS)
|
||||||
@@ -190,26 +190,6 @@ The build system is optimized for development and production deployments with Do
|
|||||||
- Build artifact caching for faster rebuilds
|
- Build artifact caching for faster rebuilds
|
||||||
- Support for custom patches and modifications
|
- Support for custom patches and modifications
|
||||||
|
|
||||||
### Module Build Source Path
|
|
||||||
|
|
||||||
**`MODULES_REBUILD_SOURCE_PATH`** - Path to AzerothCore source used for C++ module compilation.
|
|
||||||
|
|
||||||
**Default:** `${STORAGE_PATH_LOCAL}/source/azerothcore`
|
|
||||||
|
|
||||||
Auto-selects the appropriate fork:
|
|
||||||
- Playerbots enabled → `./local-storage/source/azerothcore-playerbots`
|
|
||||||
- Standard build → `./local-storage/source/azerothcore`
|
|
||||||
|
|
||||||
**Custom Override:**
|
|
||||||
```bash
|
|
||||||
MODULES_REBUILD_SOURCE_PATH=/path/to/custom/azerothcore
|
|
||||||
```
|
|
||||||
|
|
||||||
**Notes:**
|
|
||||||
- Must be a valid AzerothCore git repository
|
|
||||||
- Cannot be inside `STORAGE_PATH` (performance)
|
|
||||||
- Auto-managed by `setup-source.sh` and `rebuild-with-modules.sh`
|
|
||||||
|
|
||||||
## Custom Configuration
|
## Custom Configuration
|
||||||
Advanced customization options for specialized deployments and development environments.
|
Advanced customization options for specialized deployments and development environments.
|
||||||
|
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ The module collection is organized into the following categories:
|
|||||||
| **[eluna-scripts](https://github.com/Isidorsson/Eluna-scripts.git)** | Collection of Lua scripts for creating custom gameplay mechanics and features |
|
| **[eluna-scripts](https://github.com/Isidorsson/Eluna-scripts.git)** | Collection of Lua scripts for creating custom gameplay mechanics and features |
|
||||||
| **[eluna-ts](https://github.com/azerothcore/eluna-ts.git)** | Adds a TS-to-Lua workflow so Eluna scripts can be authored with modern tooling |
|
| **[eluna-ts](https://github.com/azerothcore/eluna-ts.git)** | Adds a TS-to-Lua workflow so Eluna scripts can be authored with modern tooling |
|
||||||
| **[mod-aio](https://github.com/Rochet2/AIO.git)** | Pure Lua server-client communication system for bidirectional data transmission |
|
| **[mod-aio](https://github.com/Rochet2/AIO.git)** | Pure Lua server-client communication system for bidirectional data transmission |
|
||||||
| **[mod-ale](https://github.com/azerothcore/mod-ale.git)** | ALE (AzerothCore Lua Engine) - Lua scripting engine for custom gameplay mechanics (formerly Eluna) |
|
| **[mod-ale](https://github.com/azerothcore/mod-ale.git)** | Adds Eluna Lua scripting engine for creating custom gameplay mechanics |
|
||||||
|
|
||||||
## Admin Tools
|
## Admin Tools
|
||||||
|
|
||||||
|
|||||||
@@ -415,51 +415,6 @@ Comprehensive deployment verification with health checks and service validation.
|
|||||||
./scripts/bash/verify-deployment.sh --quick # Quick health check only
|
./scripts/bash/verify-deployment.sh --quick # Quick health check only
|
||||||
```
|
```
|
||||||
|
|
||||||
#### `scripts/bash/validate-env.sh` - Environment Configuration Validator
|
|
||||||
Validates `.env` configuration for required and optional variables with detailed reporting.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./scripts/bash/validate-env.sh # Basic validation (required vars only)
|
|
||||||
./scripts/bash/validate-env.sh --strict # Validate required + optional vars
|
|
||||||
./scripts/bash/validate-env.sh --quiet # Errors only, suppress success messages
|
|
||||||
```
|
|
||||||
|
|
||||||
**Exit Codes:**
|
|
||||||
- `0` - All required variables present (and optional if --strict)
|
|
||||||
- `1` - Missing required variables
|
|
||||||
- `2` - Missing optional variables (only in --strict mode)
|
|
||||||
|
|
||||||
**Validates:**
|
|
||||||
- **Project Configuration:** `COMPOSE_PROJECT_NAME`, `NETWORK_NAME`
|
|
||||||
- **Repository URLs:** Standard and playerbots AzerothCore repositories
|
|
||||||
- **Storage Paths:** `STORAGE_PATH`, `STORAGE_PATH_LOCAL`, `MODULES_REBUILD_SOURCE_PATH`
|
|
||||||
- **Database Settings:** MySQL credentials, ports, database names
|
|
||||||
- **Container Config:** Container names and user permissions
|
|
||||||
- **Build Paths:** Module rebuild source paths (optional)
|
|
||||||
- **Performance Tuning:** MySQL buffer pool, InnoDB settings (optional)
|
|
||||||
- **Image References:** Docker image tags (optional)
|
|
||||||
|
|
||||||
**Use Cases:**
|
|
||||||
- Pre-deployment validation
|
|
||||||
- Troubleshooting configuration issues
|
|
||||||
- CI/CD pipeline checks
|
|
||||||
- Documentation of environment requirements
|
|
||||||
|
|
||||||
**Example Output:**
|
|
||||||
```
|
|
||||||
ℹ️ Validating environment configuration...
|
|
||||||
✅ Loaded environment from /path/to/.env
|
|
||||||
|
|
||||||
ℹ️ Checking required variables...
|
|
||||||
✅ COMPOSE_PROJECT_NAME=azerothcore-realmmaster
|
|
||||||
✅ NETWORK_NAME=azerothcore
|
|
||||||
✅ STORAGE_PATH=./storage
|
|
||||||
✅ MYSQL_ROOT_PASSWORD=********
|
|
||||||
✅ All required variables are set
|
|
||||||
|
|
||||||
✅ Environment validation passed ✨
|
|
||||||
```
|
|
||||||
|
|
||||||
### Backup System Scripts
|
### Backup System Scripts
|
||||||
|
|
||||||
#### `scripts/bash/backup-scheduler.sh` - Automated Backup Service
|
#### `scripts/bash/backup-scheduler.sh` - Automated Backup Service
|
||||||
|
|||||||
@@ -141,10 +141,6 @@ run_post_install_hooks(){
|
|||||||
export MODULES_ROOT="${MODULES_ROOT:-/modules}"
|
export MODULES_ROOT="${MODULES_ROOT:-/modules}"
|
||||||
export LUA_SCRIPTS_TARGET="/azerothcore/lua_scripts"
|
export LUA_SCRIPTS_TARGET="/azerothcore/lua_scripts"
|
||||||
|
|
||||||
# Pass build environment variables to hooks
|
|
||||||
export STACK_SOURCE_VARIANT="${STACK_SOURCE_VARIANT:-}"
|
|
||||||
export MODULES_REBUILD_SOURCE_PATH="${MODULES_REBUILD_SOURCE_PATH:-}"
|
|
||||||
|
|
||||||
# Execute the hook script
|
# Execute the hook script
|
||||||
if "$hook_script"; then
|
if "$hook_script"; then
|
||||||
ok "Hook '$hook' completed successfully"
|
ok "Hook '$hook' completed successfully"
|
||||||
@@ -178,18 +174,7 @@ install_enabled_modules(){
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
if [ -d "$dir/.git" ]; then
|
if [ -d "$dir/.git" ]; then
|
||||||
info "$dir already present; checking for updates"
|
info "$dir already present; skipping clone"
|
||||||
(cd "$dir" && git fetch origin >/dev/null 2>&1 || warn "Failed to fetch updates for $dir")
|
|
||||||
local current_branch
|
|
||||||
current_branch=$(cd "$dir" && git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "master")
|
|
||||||
if (cd "$dir" && git pull origin "$current_branch" 2>&1 | grep -q "Already up to date"); then
|
|
||||||
info "$dir is already up to date"
|
|
||||||
else
|
|
||||||
ok "$dir updated from remote"
|
|
||||||
fi
|
|
||||||
if [ -n "$ref" ]; then
|
|
||||||
(cd "$dir" && git checkout "$ref") || warn "Unable to checkout ref $ref for $dir"
|
|
||||||
fi
|
|
||||||
elif [ -d "$dir" ]; then
|
elif [ -d "$dir" ]; then
|
||||||
warn "$dir exists but is not a git repository; leaving in place"
|
warn "$dir exists but is not a git repository; leaving in place"
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -41,68 +41,9 @@ Reads patch definitions from module metadata.
|
|||||||
|
|
||||||
## Module-Specific Hooks
|
## Module-Specific Hooks
|
||||||
|
|
||||||
Module-specific hooks are named after their primary module and handle unique setup requirements.
|
Module-specific hooks are named after their primary module:
|
||||||
|
- `mod-ale-patches` - Apply mod-ale compatibility fixes
|
||||||
### `mod-ale-patches`
|
- `black-market-setup` - Black Market specific setup
|
||||||
Applies compatibility patches for mod-ale (ALE - AzerothCore Lua Engine, formerly Eluna) when building with the AzerothCore playerbots fork.
|
|
||||||
|
|
||||||
**Auto-Detection:**
|
|
||||||
The hook automatically detects if you're building with the playerbots fork by checking:
|
|
||||||
1. `STACK_SOURCE_VARIANT=playerbots` environment variable
|
|
||||||
2. `MODULES_REBUILD_SOURCE_PATH` contains "azerothcore-playerbots"
|
|
||||||
|
|
||||||
**Patches Applied:**
|
|
||||||
|
|
||||||
#### SendTrainerList Compatibility Fix
|
|
||||||
**When Applied:** Automatically for playerbots fork (or when `APPLY_SENDTRAINERLIST_PATCH=1`)
|
|
||||||
**What it fixes:** Adds missing `GetGUID()` call to fix trainer list display
|
|
||||||
**File:** `src/LuaEngine/methods/PlayerMethods.h`
|
|
||||||
**Change:**
|
|
||||||
```cpp
|
|
||||||
// Before (broken)
|
|
||||||
player->GetSession()->SendTrainerList(obj);
|
|
||||||
|
|
||||||
// After (fixed)
|
|
||||||
player->GetSession()->SendTrainerList(obj->GetGUID());
|
|
||||||
```
|
|
||||||
|
|
||||||
#### MovePath Compatibility Fix
|
|
||||||
**When Applied:** Only when explicitly enabled with `APPLY_MOVEPATH_PATCH=1` (disabled by default)
|
|
||||||
**What it fixes:** Updates deprecated waypoint movement API
|
|
||||||
**File:** `src/LuaEngine/methods/CreatureMethods.h`
|
|
||||||
**Change:**
|
|
||||||
```cpp
|
|
||||||
// Before (deprecated)
|
|
||||||
MoveWaypoint(creature->GetWaypointPath(), true);
|
|
||||||
|
|
||||||
// After (updated API)
|
|
||||||
MovePath(creature->GetWaypointPath(), FORCED_MOVEMENT_RUN);
|
|
||||||
```
|
|
||||||
**Note:** Currently disabled by default as testing shows it's not required for normal operation.
|
|
||||||
|
|
||||||
**Feature Flags:**
|
|
||||||
```bash
|
|
||||||
# Automatically set for playerbots fork
|
|
||||||
APPLY_SENDTRAINERLIST_PATCH=1
|
|
||||||
|
|
||||||
# Disabled by default - enable if needed
|
|
||||||
APPLY_MOVEPATH_PATCH=0
|
|
||||||
```
|
|
||||||
|
|
||||||
**Debug Output:**
|
|
||||||
The hook provides detailed debug information during builds:
|
|
||||||
```
|
|
||||||
🔧 mod-ale-patches: Applying playerbots fork compatibility fixes to mod-ale
|
|
||||||
✅ Playerbots detected via MODULES_REBUILD_SOURCE_PATH
|
|
||||||
✅ Applied SendTrainerList compatibility fix
|
|
||||||
✅ Applied 1 compatibility patch(es)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why This Exists:**
|
|
||||||
The playerbots fork has slightly different API signatures in certain WorldSession methods. These patches ensure mod-ale (Eluna) compiles and functions correctly with both standard AzerothCore and the playerbots fork.
|
|
||||||
|
|
||||||
### `black-market-setup`
|
|
||||||
Black Market specific setup tasks.
|
|
||||||
|
|
||||||
## Usage in Manifest
|
## Usage in Manifest
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
# Module-specific hook for mod-ale compatibility patches
|
# Module-specific hook for mod-ale compatibility patches
|
||||||
# NOTE: These patches are primarily needed for the AzerothCore playerbots fork
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Hook environment
|
# Hook environment
|
||||||
@@ -8,42 +7,12 @@ MODULE_KEY="${MODULE_KEY:-}"
|
|||||||
MODULE_DIR="${MODULE_DIR:-}"
|
MODULE_DIR="${MODULE_DIR:-}"
|
||||||
MODULE_NAME="${MODULE_NAME:-}"
|
MODULE_NAME="${MODULE_NAME:-}"
|
||||||
|
|
||||||
# Detect if we're building with playerbots fork
|
|
||||||
IS_PLAYERBOTS_FORK=0
|
|
||||||
|
|
||||||
# Method 1: Check STACK_SOURCE_VARIANT environment variable
|
|
||||||
if [ "${STACK_SOURCE_VARIANT:-}" = "playerbots" ]; then
|
|
||||||
IS_PLAYERBOTS_FORK=1
|
|
||||||
echo " ✅ Playerbots detected via STACK_SOURCE_VARIANT"
|
|
||||||
# Method 2: Check MODULES_REBUILD_SOURCE_PATH
|
|
||||||
elif [ -n "${MODULES_REBUILD_SOURCE_PATH:-}" ] && echo "${MODULES_REBUILD_SOURCE_PATH}" | grep -q "azerothcore-playerbots"; then
|
|
||||||
IS_PLAYERBOTS_FORK=1
|
|
||||||
echo " ✅ Playerbots detected via MODULES_REBUILD_SOURCE_PATH"
|
|
||||||
else
|
|
||||||
echo " ❌ Playerbots fork not detected"
|
|
||||||
echo " 🔍 Debug: STACK_SOURCE_VARIANT='${STACK_SOURCE_VARIANT:-}'"
|
|
||||||
echo " 🔍 Debug: MODULES_REBUILD_SOURCE_PATH='${MODULES_REBUILD_SOURCE_PATH:-}'"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Feature flags (set to 0 to disable specific patches)
|
|
||||||
APPLY_MOVEPATH_PATCH="${APPLY_MOVEPATH_PATCH:-0}" # Disabled by default - appears unnecessary
|
|
||||||
# SendTrainerList patch: auto-detect based on fork, but can be overridden
|
|
||||||
if [ -z "${APPLY_SENDTRAINERLIST_PATCH:-}" ]; then
|
|
||||||
APPLY_SENDTRAINERLIST_PATCH="$IS_PLAYERBOTS_FORK" # Only needed for playerbots fork
|
|
||||||
else
|
|
||||||
APPLY_SENDTRAINERLIST_PATCH="${APPLY_SENDTRAINERLIST_PATCH}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$MODULE_DIR" ] || [ ! -d "$MODULE_DIR" ]; then
|
if [ -z "$MODULE_DIR" ] || [ ! -d "$MODULE_DIR" ]; then
|
||||||
echo "❌ mod-ale-patches: Invalid module directory: $MODULE_DIR"
|
echo "❌ mod-ale-patches: Invalid module directory: $MODULE_DIR"
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$IS_PLAYERBOTS_FORK" = "1" ]; then
|
echo "🔧 mod-ale-patches: Applying compatibility fixes to $MODULE_NAME"
|
||||||
echo "🔧 mod-ale-patches: Applying playerbots fork compatibility fixes to $MODULE_NAME"
|
|
||||||
else
|
|
||||||
echo "🔧 mod-ale-patches: Checking compatibility fixes for $MODULE_NAME"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Apply MovePath compatibility patch
|
# Apply MovePath compatibility patch
|
||||||
apply_movepath_patch() {
|
apply_movepath_patch() {
|
||||||
@@ -68,42 +37,10 @@ apply_movepath_patch() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Apply SendTrainerList compatibility patch
|
|
||||||
apply_sendtrainerlist_patch() {
|
|
||||||
local target_file="$MODULE_DIR/src/LuaEngine/methods/PlayerMethods.h"
|
|
||||||
|
|
||||||
if [ ! -f "$target_file" ]; then
|
|
||||||
echo " ⚠️ SendTrainerList patch target file missing: $target_file"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if the buggy code exists (without GetGUID())
|
|
||||||
if grep -q 'player->GetSession()->SendTrainerList(obj);' "$target_file"; then
|
|
||||||
# Apply the fix by adding ->GetGUID()
|
|
||||||
if sed -i 's/player->GetSession()->SendTrainerList(obj);/player->GetSession()->SendTrainerList(obj->GetGUID());/' "$target_file"; then
|
|
||||||
echo " ✅ Applied SendTrainerList compatibility fix"
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
echo " ❌ Failed to apply SendTrainerList compatibility fix"
|
|
||||||
return 2
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo " ✅ SendTrainerList compatibility fix already present"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Apply all patches
|
# Apply all patches
|
||||||
patch_count=0
|
patch_count=0
|
||||||
if [ "$APPLY_MOVEPATH_PATCH" = "1" ]; then
|
if apply_movepath_patch; then
|
||||||
if apply_movepath_patch; then
|
patch_count=$((patch_count + 1))
|
||||||
patch_count=$((patch_count + 1))
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ "$APPLY_SENDTRAINERLIST_PATCH" = "1" ]; then
|
|
||||||
if apply_sendtrainerlist_patch; then
|
|
||||||
patch_count=$((patch_count + 1))
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $patch_count -eq 0 ]; then
|
if [ $patch_count -eq 0 ]; then
|
||||||
|
|||||||
11
setup.sh
11
setup.sh
@@ -1487,16 +1487,11 @@ fi
|
|||||||
MODULES_CPP_LIST="$(IFS=','; printf '%s' "${enabled_cpp_module_keys[*]}")"
|
MODULES_CPP_LIST="$(IFS=','; printf '%s' "${enabled_cpp_module_keys[*]}")"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Determine source variant based ONLY on playerbots module
|
local STACK_IMAGE_MODE="standard"
|
||||||
local STACK_SOURCE_VARIANT="core"
|
local STACK_SOURCE_VARIANT="core"
|
||||||
if [ "$MODULE_PLAYERBOTS" = "1" ] || [ "$PLAYERBOT_ENABLED" = "1" ]; then
|
if [ "$MODULE_PLAYERBOTS" = "1" ] || [ "$PLAYERBOT_ENABLED" = "1" ]; then
|
||||||
STACK_SOURCE_VARIANT="playerbots"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Determine image mode based on source variant and build requirements
|
|
||||||
local STACK_IMAGE_MODE="standard"
|
|
||||||
if [ "$STACK_SOURCE_VARIANT" = "playerbots" ]; then
|
|
||||||
STACK_IMAGE_MODE="playerbots"
|
STACK_IMAGE_MODE="playerbots"
|
||||||
|
STACK_SOURCE_VARIANT="playerbots"
|
||||||
elif [ "$NEEDS_CXX_REBUILD" = "1" ]; then
|
elif [ "$NEEDS_CXX_REBUILD" = "1" ]; then
|
||||||
STACK_IMAGE_MODE="modules"
|
STACK_IMAGE_MODE="modules"
|
||||||
fi
|
fi
|
||||||
@@ -1592,7 +1587,7 @@ fi
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
local default_source_rel="${LOCAL_STORAGE_ROOT}/source/azerothcore"
|
local default_source_rel="${LOCAL_STORAGE_ROOT}/source/azerothcore"
|
||||||
if [ "$STACK_SOURCE_VARIANT" = "playerbots" ]; then
|
if [ "$MODULE_PLAYERBOTS" = "1" ]; then
|
||||||
default_source_rel="${LOCAL_STORAGE_ROOT}/source/azerothcore-playerbots"
|
default_source_rel="${LOCAL_STORAGE_ROOT}/source/azerothcore-playerbots"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user