Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/hatersgit/hateforge
Browse files Browse the repository at this point in the history
  • Loading branch information
hatersgit committed Feb 21, 2024
2 parents 9d8cf00 + 72b91b8 commit 9dccdb9
Show file tree
Hide file tree
Showing 16 changed files with 622 additions and 354 deletions.
106 changes: 0 additions & 106 deletions .github/workflows/add-to-project.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/codestyle.yml

This file was deleted.

35 changes: 29 additions & 6 deletions .github/workflows/windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: windows-build
on:
push:
branches:
- 'master'
- "master"
pull_request:
types: ['labeled', 'opened', 'synchronize', 'reopened']
types: ["labeled", "opened", "synchronize", "reopened"]

concurrency:
group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
Expand All @@ -20,10 +20,10 @@ jobs:
name: ${{ matrix.os }}
env:
BOOST_ROOT: C:\local\boost_1_82_0
if: |
github.repository == 'azerothcore/azerothcore-wotlk'
&& !github.event.pull_request.draft
&& (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
# if: |
# github.repository == 'azerothcore/azerothcore-wotlk'
# && !github.event.pull_request.draft
# && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
steps:
- uses: actions/checkout@v4
- name: ccache
Expand All @@ -39,3 +39,26 @@ jobs:
run: |
export CTOOLS_BUILD=all
./acore.sh compiler build
- name: Zip Mod-Forge SQL folder
shell: powershell
run: |
Compress-Archive -Path ./modules/mod-Forge -Destination ./env/dist/mod-forge-sql.zip
- name: Zip Data SQL folder
shell: powershell
run: |
Compress-Archive -Path ./data/sql/custom -Destination ./env/dist/data-sql.zip
- uses: "marvinpinto/action-automatic-releases@latest"
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
with:
repo_token: "${{ secrets.GH_TOKEN }}"
automatic_release_tag: "Latest"
prerelease: false
title: "Release"
files: |
./env/dist/worldserver.exe
./env/dist/mod-forge-sql.zip
./env/dist/data-sql.zip
8 changes: 4 additions & 4 deletions modules/mod-Forge/src/ForgePlayerMessageHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
#include <ForgeCacheCommands.cpp>
#include <ActivateClassSpecHandler.cpp>
#include <GetCollectionsHandler.cpp>
#include <ApplyTransmogHandler.cpp>
/* #include <ApplyTransmogHandler.cpp>
#include <GetTransmogHandler.cpp>
#include <GetTransmogSetsHandler.cpp>
#include <SaveTransmogSetHandler.cpp>
#include <SaveTransmogSetHandler.cpp> */
#include <StartMythicHandler.cpp>
#include <GetAffixesHandler.cpp>
#include <GetCharacterLoadoutsHandler.cpp>
Expand Down Expand Up @@ -276,11 +276,11 @@ void AddForgePlayerMessageHandler()
sTopicRouter->AddHandler(new UpdateSpecHandler(cache));
sTopicRouter->AddHandler(new PrestigeHandler(cache, cm));
sTopicRouter->AddHandler(new ActivateClassSpecHandler(cache, cm));
sTopicRouter->AddHandler(new GetCollectionsHandler(cache, cm));
/* sTopicRouter->AddHandler(new GetCollectionsHandler(cache, cm));
sTopicRouter->AddHandler(new ApplyTransmogHandler(cache, cm));
sTopicRouter->AddHandler(new SaveTransmogSetHandler(cache, cm));
sTopicRouter->AddHandler(new GetTransmogSetsHandler(cache, cm));
sTopicRouter->AddHandler(new GetTransmogHandler(cache, cm));
sTopicRouter->AddHandler(new GetTransmogHandler(cache, cm)); */
sTopicRouter->AddHandler(new StartMythicHandler(cache, cm));
sTopicRouter->AddHandler(new GetAffixesHandler(cache, cm));
sTopicRouter->AddHandler(new GetCharacterLoadoutsHandler(cache, cm));
Expand Down
4 changes: 2 additions & 2 deletions src/server/game/Entities/Item/Transmogrification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ void Transmogrification::SaveToDB(Player* player, uint32 transmogtype, uint32 vi
stmt->SetData(0, player->GetSession()->GetAccountId());
stmt->SetData(1, transmogtype);
stmt->SetData(2, visual);
CharacterDatabase.Execute(stmt);
/* CharacterDatabase.Execute(stmt); */
}

bool Transmogrification::HasVisual(Player* player, uint32 transmogtype, uint32 visual)
Expand All @@ -889,7 +889,7 @@ uint32 Transmogrification::Save(Player* player, uint32 transmogtype, ItemTemplat
if (player->transmogrification_appearances[transmogtype].insert(visual->ItemId).second)
{
player->_tmogVisualToItem[transmogtype][visual->DisplayInfoID] = visual->ItemId;
SaveToDB(player, transmogtype, visual->ItemId);
/* SaveToDB(player, transmogtype, visual->ItemId); */
return visual->ItemId;
}
}
Expand Down
Loading

0 comments on commit 9dccdb9

Please sign in to comment.