more little bugfixes

westphallm1 · Jan 27, 2022 · ad13dfb · ad13dfb
1 parent 885efe6
commit ad13dfb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Items/Accessories/MinionSpawningItemPlayer.cs b/Items/Accessories/MinionSpawningItemPlayer.cs
@@ -93,6 +93,15 @@ public override void PreUpdate()
 				}
 				minionVarietyBonusCount = uniqueMinionTypes.Count;
 			}
+
+			// add bonus for unique combat pets
+			for (int i = 0; i < player.CountBuffs(); i++)
+			{
+				if (CombatPetBuff.CombatPetBuffTypes.Contains(player.buffType[i]))
+				{
+					minionVarietyBonusCount += 1;
+				}
+			}
 		}
 
 		public override void ModifyWeaponDamage(Item item, ref float add, ref float mult, ref float flat)
@@ -191,15 +200,6 @@ public override void PostUpdate()
 				}
 			}
 
-			// add bonus for unique combat pets
-			for (int i = 0; i < player.CountBuffs(); i++)
-			{
-				if (CombatPetBuff.CombatPetBuffTypes.Contains(player.buffType[i]))
-				{
-					minionVarietyBonusCount += 1;
-				}
-			}
-
 			if (minionVarietyBonusCount > 1 && ClientConfig.Instance.ShowMinionVarietyBonus)
 			{
 				int buffType = BuffType<MinionVarietyBuff>();

diff --git a/Projectiles/Minions/CombatPets/CombatPetBaseClasses/CombatPetLevels.cs b/Projectiles/Minions/CombatPets/CombatPetBaseClasses/CombatPetLevels.cs
@@ -263,7 +263,7 @@ public void TemporarilyUnflagPetBuff(int buffId)
 						BuffFlagsToReset.Add(buffId);
 						buffResetCountdown = 4;
 						unmarkCount++;
-						if(unmarkCount >= PetLevelInfo.MaxPets - 1)
+						if(unmarkCount >= AvailablePetSlots - 1)
 						{
 							break;
 						}