From e2a1ccd118d129b96e09ff1a15ed0adb1d4a3897 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Sat, 1 Jul 2017 20:18:02 +0200
Subject: [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.
---
 src/common/Utilities/Containers.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/common/Utilities/Containers.h')

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; }
-- 
cgit v1.2.3