[3.3.5] Combat/Threat rewrite - prep & refactor (#19966)

* Combat/Threat rewrite (PR #19930) prep work. Mostly refactors, and a compatibility layer on ThreatManager/HostileReference that allows scripts to be changed already.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h
index a2b42011bd8..56e5e3c3aa2 100644
--- a/src/common/Utilities/Containers.h
+++ b/src/common/Utilities/Containers.h
@@ -87,6 +87,7 @@ namespace Trinity
         template<class C>
         inline auto SelectRandomContainerElement(C const& container) -> typename std::add_const<decltype(*std::begin(container))>::type&
         {
+            ASSERT(Size(container));
             auto it = std::begin(container);
             std::advance(it, urand(0, uint32(Size(container)) - 1));
             return *it;
@@ -196,6 +197,7 @@ namespace Trinity
         {
         public:
             IteratorPair() : _iterators() { }
+            IteratorPair(iterator first, iterator second) : _iterators(first, second) { }
             IteratorPair(std::pair<iterator, iterator> iterators) : _iterators(iterators) { }
 
             iterator begin() const { return _iterators.first; }