Merge pull request #1307 from wowsims/feature/add-trinket-swapping

Add back prepull Mastery for secondary trinket swaps during swapped prepull
wowsims · Jan 16, 2025 · e223021 · e223021
2 parents c6d999e + bb8dc87
commit e223021
Show file tree

Hide file tree

Showing 7 changed files with 275 additions and 236 deletions.
diff --git a/proto/warlock.proto b/proto/warlock.proto
@@ -124,7 +124,7 @@ message WarlockOptions {
 
 	Summon summon = 1;
 	bool detonate_seed = 2;
-	int32 prepull_mastery = 3 [deprecated=true]; // Use Item Swap sets instead
+	int32 prepull_mastery = 3; // Used for static Mastery Item Swap sets
 	int32 prepull_post_snapshot_mana = 4 [deprecated=true]; // Use Item Swap sets instead
 	bool use_item_swap_bonus_stats = 5;
 }

diff --git a/sim/core/apl.go b/sim/core/apl.go
@@ -169,7 +169,7 @@ func (unit *Unit) newAPLRotation(config *proto.APLRotation) *APLRotation {
 		}
 
 		// If user has Item Swapping enabled and hasn't swapped back to the main set do it here.
-		if character.ItemSwap.IsEnabled() {
+		if character != nil && character.ItemSwap.IsEnabled() {
 			var hasMainSwap bool
 			for _, prepullAction := range rotation.allPrepullActions() {
 				if action, ok := prepullAction.impl.(*APLActionItemSwap); ok {