Skip to content

[pull] master from TrinityCore:master #1189

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

Merged
pull merged 2 commits into from
Jan 21, 2026
Merged

[pull] master from TrinityCore:master #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd6dc22
DB/Durotar: Update Thotar gossip (#31628)
Hyacinthrose Jan 20, 2026
db42e71
Core/Utils: Add aliasing constructors to Trinity::unique_weak_ptr all…
Shauren Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions sql/updates/world/2026_01_20_00_world.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
-- Update Thotar the Razor Hill hunter trainer
DELETE FROM `creature_template_gossip` WHERE `CreatureID` = 3171;
INSERT INTO `creature_template_gossip` (`CreatureID`, `MenuID`, `VerifiedBuild`) VALUES
(3171, 14006, 65299); -- 3171

DELETE FROM `gossip_menu` WHERE `MenuID` = 14006;
INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
(14006, 4888, 65299), -- 3171
(14006, 5002, 65299); -- 3171

-- Add conditions for If/If Not a Hunter
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 14006;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `ConditionStringValue1`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(14, 14006, 5002, 0, 0, 15, 0, 4, 0, 0, '', 1, 0, 0, '', 'Show gossip text if player is not a Hunter'),
(14, 14006, 4888, 0, 0, 15, 0, 4, 0, 0, '', 0, 0, 0, '', 'Show gossip text if player is a Hunter');
8 changes: 8 additions & 0 deletions src/common/Utilities/UniqueTrackablePtr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,14 @@ class unique_weak_ptr
unique_weak_ptr(unique_weak_ptr<T2>&& other) noexcept
: _ptr(std::move(other)._ptr) { }

template <typename T2>
unique_weak_ptr(unique_trackable_ptr<T2> const& aliased, T* aliasValue)
: _ptr(std::shared_ptr<T>(aliased._ptr, aliasValue)) { }

template <typename T2>
unique_weak_ptr(unique_trackable_ptr<T2>&& aliased, T* aliasValue)
: _ptr(std::shared_ptr<T>(std::move(aliased)._ptr, aliasValue)) { }

unique_weak_ptr& operator=(unique_trackable_ptr<T> const& trackable)
{
_ptr = trackable._ptr;
Expand Down
Loading