From f83817d6798a0485078adeaa0688da2e0ac44a7b Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sat, 25 Jun 2022 22:53:25 -0400
Subject: [PATCH] Core/Criteria: Implemented worldstate requirements for
 criteria updates

Port From (https://github.com/TrinityCore/TrinityCore/commit/919ada8d94a321d743bf581673b28b810780fc7e)
---
 Source/Game/Achievements/CriteriaHandler.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/Game/Achievements/CriteriaHandler.cs b/Source/Game/Achievements/CriteriaHandler.cs
index ebde5521f..bf0d62f91 100644
--- a/Source/Game/Achievements/CriteriaHandler.cs
+++ b/Source/Game/Achievements/CriteriaHandler.cs
@@ -892,6 +892,10 @@ namespace Game.Achievements
                 return false;
             }
 
+            if (criteria.Entry.EligibilityWorldStateID != 0)
+                if (Global.WorldStateMgr.GetValue(criteria.Entry.EligibilityWorldStateID, referencePlayer.GetMap()) != criteria.Entry.EligibilityWorldStateValue)
+                    return false;
+
             return true;
         }