Skip to content

fix (3.3.5-Lfgsolo): Conflict\alignment #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 14 commits into from
Oct 19, 2023
Merged

fix (3.3.5-Lfgsolo): Conflict\alignment #117

merged 14 commits into from
Oct 19, 2023

Conversation

@acidmanifesto
Copy link
Contributor

Changes proposed:

Target branch(es): 3.3.5-lfgsolo

Issues addressed: Conflict

Tests performed: (Does it build, tested in-game, etc)

Known issues and TODO list:

  • [ ]
  • [ ]

Jildor and others added 13 commits September 18, 2023 11:48
@Jildor
Core/Pets: Avoid loading creature_addon/creature_template_addon (#29331)
edb00d4 
*Also removed spawnId when the pet is created
@acidmanifesto
Core/Groups: Reduce differences between branches (define naming) (#29…
f746c7f 
…332)
@jackpoz
Core/Battlegrounds: Fix group loot (#29300)
fe2da02
@Ovahlord @Shauren
Core/World: added underlying types to world config enums
a5217f5
@Ovahlord @Shauren
Core/Player: return player corpse locations by reference instead of c…
d11d992 
…reating copies
@Ovahlord @Shauren
Core/World: refactored locale detection to resolve a ill-defined for …
b3dbc8b 
…loop warning
@kerhong
Build: Fixed tools only build (#29341)
ff0d198 
(cherry picked from commit 592e01cf7a5d7b6f7ec63d30edc09dd9d4062b62)
@Shauren
Core/Objects: Remove restriction on what object types can be set as a…
163c674 
…ctive

(cherry picked from commit 3031fbb63bfb2df2aa041bd9c04c5c42b0c07c05)
@robinsch @Shauren
Core/Object: Remove casts in WorldObject::setActive
2df1bc3
@Shauren
Core/Auras: Registering a new owned aura will now search existing own…
a85dcb6 
…ed auras instead of applied auras to check for unstackable one

Closes #22234

(cherry picked from commit dc661a34b1d1e099e2c1854e8fa9446115e30c96)
@Shauren
Core/Auras: Implemented SPELL_ATTR7_DISABLE_AURA_WHILE_DEAD (suppress…
d028bb0 
… aura applications while dead without removing the aura)

(cherry picked from commit 0f7dd4eadf90a5407fd232d083485430d725152f)
@acidmanifesto
Merge branch '3.3.5' into lfg-solo-2
3ea2538
@acidmanifesto
update (module): core aligntment
7e73057
@acidmanifesto acidmanifesto changed the base branch from 3.3.5 to 3.3.5-lfgsolo October 16, 2023 16:15
@Aokromes
Copy link
Member

Aokromes commented Oct 16, 2023 •
edited
Loading 

[ 31%] Building CXX object src/server/game/CMakeFiles/game.dir/Groups/Group.cpp.o
In file included from /home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.cpp:18:
/home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.cpp: In member function ‘GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(const Battleground*, BattlegroundQueueTypeId, uint32, uint32, bool, uint32)’:
/home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.h:42:24: error: expected unqualified-id before numeric constant
   42 | #define MAX_GROUP_SIZE 5
      |                        ^
/home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.cpp:1975:33: note: in expansion of macro ‘MAX_GROUP_SIZE’
 1975 |     if (memberscount > bgEntry->MAX_GROUP_SIZE)                // no MinPlayerCount for battlegrounds
      |                                 ^~~~~~~~~~~~~~
compilation terminated due to -Wfatal-errors.
make[2]: *** [src/server/game/CMakeFiles/game.dir/build.make:1917: src/server/game/CMakeFiles/game.dir/Groups/Group.cpp.o] Error 1

@acidmanifesto
Copy link
Contributor Author 

[ 31%] Building CXX object src/server/game/CMakeFiles/game.dir/Groups/Group.cpp.o
In file included from /home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.cpp:18:
/home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.cpp: In member function ‘GroupJoinBattlegroundResult Group::CanJoinBattlegroundQueue(const Battleground*, BattlegroundQueueTypeId, uint32, uint32, bool, uint32)’:
/home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.h:42:24: error: expected unqualified-id before numeric constant
   42 | #define MAX_GROUP_SIZE 5
      |                        ^
/home/runner/work/TrinityCoreCustomChanges/TrinityCoreCustomChanges/src/server/game/Groups/Group.cpp:1975:33: note: in expansion of macro ‘MAX_GROUP_SIZE’
 1975 |     if (memberscount > bgEntry->MAX_GROUP_SIZE)                // no MinPlayerCount for battlegrounds
      |                                 ^~~~~~~~~~~~~~
compilation terminated due to -Wfatal-errors.
make[2]: *** [src/server/game/CMakeFiles/game.dir/build.make:1917: src/server/game/CMakeFiles/game.dir/Groups/Group.cpp.o] Error 1

fixed. thanks
a19b766

@jackpoz jackpoz merged commit d38acb9 into TrinityCore:3.3.5-lfgsolo Oct 19, 2023
@jackpoz
Copy link
Member

jackpoz commented Oct 19, 2023

Thanks for the PR 🚀 😃

@acidmanifesto acidmanifesto mentioned this pull request Oct 20, 2023
Merged
@acidmanifesto acidmanifesto deleted the lfg-solo-2 branch October 20, 2023 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

Branch-3.3.5a

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@acidmanifesto @Aokromes @jackpoz @Jildor @Ovahlord @kerhong @Shauren @robinsch