ModernUO/Projects/UOContent/Mobiles/Vendors/NPC
Kamron Batman 05b6ca9d5d
refactor: one master reference behind ControlMaster and SummonMaster (#2670)
## Summary

`BaseCreature` stored the pet owner (`ControlMaster`) and the summoner (`SummonMaster`) in two fields. Every flow that manages pets kept them in step by hand: summon, transfer, stable, claim, ball of summoning and GM obey. They now share one `_master` field, and the two properties read it through the Controlled and Summoned flags:

```csharp
ControlMaster => Controlled ? master : null
SummonMaster  => Controlled && !Summoned ? null : master
```

Every existing reader keeps its meaning:
- `ControlMaster` is still "the owner".
- `SummonMaster` is still "the summoner, controlled or not".

Blade spirits, energy vortexes, clones, undead minions and enraged creatures (a summon master without `Summoned`) never become visible through `ControlMaster`, so the ungated readers (ML notoriety, aggressor entries and similar) behave as before.

- Setting `SummonMaster` on a plain pet does nothing, instead of quietly replacing the owner.
- `SetControlMaster` now keeps both masters in step, so the hand-written `SummonMaster` copies are removed from ball of summoning, GM obey, pet transfer, auto-stable and claim, the animal trainer's stable and claim, and jail stabling.

## Serialization

BaseCreature moves to v24 with one serialized master (slot 15); the old `SummonMaster` slot is dropped.
- `MigrateFrom(V23Content)` resolves absent fields through the same default-value methods the live reader uses.
- A save that carried both masters (a summon traded before ownership followed transfers) resolves to the owner. Legacy pre-codegen streams follow the same rule.

Requires `ModernUO.Serialization.Generator` 4.2.0 (#2671). `UOContent.Tests` was still on 4.1.0 and is bumped to match.

## Test plan

- [x] `MasterShapes_RoundTrip`: controlled pet, controlled summon, energy vortex, enraged creature
- [x] `SummonMaster_OnPlainPet_KeepsTheOwner`: owner and follower counts unchanged
- [x] `LegacyV22Stream_DifferingMasters_OwnerWins`
- [x] `V23Stream_MigratesToOneMaster_AndDefaultsAbsentFields`: both master slots -> owner; flags past bit 32; absent fields take class defaults
- [x] UOContent.Tests (1168 passed, 2 skipped) and Server.Tests (907) green
2026-09-24 21:37:28 -07:00
..
Guildmasters feat: Pre-Publish 14 Crafting (supersedes #2181, #2381) (#2476) 2026-06-07 20:27:22 -07:00
Alchemist.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
AnimalTrainer.cs refactor: one master reference behind ControlMaster and SummonMaster (#2670) 2026-09-24 21:37:28 -07:00
Architect.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Armorer.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Baker.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Bard.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Barkeeper.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Beekeeper.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Blacksmith.cs chore: Fixes variable types for possible performance issues (#2172) 2025-05-01 21:54:41 -07:00
Bowyer.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Butcher.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Carpenter.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Cobbler.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Cook.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
CustomHairstylist.cs fix: Refactors Custom Hairstylist (#2188) 2025-05-17 03:30:07 -07:00
Farmer.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Fisherman.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Furtrader.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Glassblower.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
GolemCrafter.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
GypsyAnimalTrainer.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
GypsyBanker.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
GypsyMaiden.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
HairStylist.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Herbalist.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
HolyMage.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
InnKeeper.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
IronWorker.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Jeweler.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
KeeperOfChivalry.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
LeatherWorker.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Mage.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Mapmaker.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Miller.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Miner.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Monk.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Provisioner.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Rancher.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Ranger.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
RealEstateBroker.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Scribe.cs fix: sell Bushido and Ninjitsu books through Tokuno scribes (#2622) 2026-09-09 23:07:32 -07:00
Shipwright.cs fix: Fixes missing codegen for ShipWright (#1316) 2022-12-30 10:48:42 -08:00
StoneCrafter.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Tailor.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Tanner.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
TavernKeeper.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Thief.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Tinker.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Vagabond.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
VarietyDealer.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Veterinarian.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Waiter.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Weaponsmith.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00
Weaver.cs fix: Changes on Vendor>NPC to use code generation (#1308) 2022-12-22 12:40:26 -08:00