View difference between Paste ID: 1V3m6dPh and zTHuFPcT

-#define MAX_PHASES  31
+const uint8 MAX_PHASES = 31;
 
-std::bitset<MAX_PHASES> phases;
+
     MatchStruct(Player* _player1, Player* _player2)
     {
-	MatchStruct(Player* _player1, Player* _player2) : phaseID(0) // cant phase, use 1 (2^0 = 1)
+        player1 = _player1->GetGUID();
-	{
+        player2 = _player2->GetGUID();
-		player1 = _player1->GetGUID();
+    }
-		player2 = _player2->GetGUID();
+
-	}
+    uint64 player1;
     uint64 player2;
-	uint64 player1;
+
-	uint64 player2;
+// typedef std::list<MatchStruct> MatchList;
-	uint8 phaseID;
+typedef std::map<uint8, MatchStruct> MatchList;
 MatchList MatchData;
-typedef std::list<MatchStruct> MatchList;
+
 class DuelPhasing : public PlayerScript
 {
 public:
     DuelPhasing() : PlayerScript("DuelPhasing") { }
 
-	DuelPhasing() : PlayerScript("DuelPhasing") { }
+    void OnDuelStart(Player* player1, Player* player2)
     {
-	void OnDuelStart(Player* player1, Player* player2)
+        MatchStruct info(player1, player2);
-	{
+        uint8 phaseID = 0;
-		MatchStruct info(player1, player2);
+
         if(MatchData.size() >= MAX_PHASES) // if all phases full, check if players offline:
-		if(phases.all()) // if all phases full, check if players offline:
+            ErasePlayers();
-			ErasePlayers();
+
         if(MatchData.size() >= MAX_PHASES) // full
-		if(phases.all()) // full
+        {
-		{
+            ChatHandler(player1->GetSession()).SendSysMessage("You cannot be phased at the moment");// this won't happen often
-			ChatHandler(player1->GetSession()).SendSysMessage("You cannot be phased at the moment");// this won't happen often
+            ChatHandler(player2->GetSession()).SendSysMessage("You cannot be phased at the moment");// this won't happen often
-			ChatHandler(player2->GetSession()).SendSysMessage("You cannot be phased at the moment");// this won't happen often
+        }
-		}
+        else // has phases left
-		else // has phases left
+        {
-		{
+            for (uint8 i = phaseID+1; i < MAX_PHASES; ++i)
-			for (int i = 0; i < MAX_PHASES; ++i)
+            {
-			{
+                if (MatchData.find(i) == MatchData.end())
-				if (!phases.test(i))
+                {
-				{
+                    phaseID = i;
-					phases.set(i, true); // phase in use
+                    break;
-					info.phaseID = i;
+                }
-					break;
+            }
-				}
+            ChatHandler(player1->GetSession()).SendSysMessage("You have been phased.");
-			}
+            ChatHandler(player2->GetSession()).SendSysMessage("You have been phased.");
-			ChatHandler(player1->GetSession()).SendSysMessage("You have been phased.");
+        }
-			ChatHandler(player2->GetSession()).SendSysMessage("You have been phased.");
+
-		}
+        // MatchData.push_back(info);
         if(phaseID)
-		MatchData.push_back(info);
+            MatchData[phaseID] = info;
-		player1->SetPhaseMask(pow(2.0f, info.phaseID), true);
+        player1->SetPhaseMask(pow(2.0f, phaseID), true);
-		player2->SetPhaseMask(pow(2.0f, info.phaseID), true);
+        player2->SetPhaseMask(pow(2.0f, phaseID), true);
-		// teleport etc
+        // teleport etc
-	};
+    };
 
-	void ErasePlayers()
+    void ErasePlayers()
-	{
+    {
-		for(MatchList::iterator it = MatchData.begin(); it != MatchData.end();) // loop records
+        for(MatchList::iterator it = MatchData.begin(); it != MatchData.end(); ++it) // loop records
-		{
+        {
-			Player* player1 = sObjectAccessor->FindPlayer(it->player1);
+            Player* player1 = sObjectAccessor->FindPlayer(it->second.player1);
-			Player* player2 = sObjectAccessor->FindPlayer(it->player2);
+            Player* player2 = sObjectAccessor->FindPlayer(it->second.player2);
-			if(!player1 || !player2) // neither or both offline
+            uint32 phase = pow(2.0f, it->first);
-			{
+            if(player1 && player2 && player1->GetPhaseMask() == phase && player2->GetPhaseMask() == phase)
-				// Teleport players out or something
+                continue;
 
-				phases.set(it->phaseID, false); // set phase unused
+            // teleport players out or something
-				MatchData.erase(it++);
+            MatchData.erase(it);
-				continue;
+        }
-			}
+    }
-			++it;
+
-		}
+    void OnDuelEnd(Player* pWinner, Player* pLoser, DuelCompleteType /*type*/)
-	}
+    {
         double phase = sqrt(double(pWinner->GetPhaseMask()));
-	void OnDuelEnd(Player* pWinner, Player* pLoser, DuelCompleteType /*type*/)
+        if(phase - uint8(phase))
-	{
+            return; // was not unique
-		for(MatchList::iterator it = MatchData.begin(); it != MatchData.end();) // loop records
+        uint8 phaseID = uint8(phase);
-		{
+        if(phaseID >= MAX_PHASES)
             return; // wrong ID
-			double phase = sqrt(double(pWinner->GetPhaseMask()));
+        MatchData.erase(phaseID); // if not cleared right, still cleared if ErasePlayers is called
-			if(phase - uint8(phase)) // was not unique
+
-				return;
+        pWinner->RemoveAllSpellCooldown();
-			uint8 phaseID = uint8(phase);
+        pLoser->RemoveAllSpellCooldown();
-			if(phaseID >= phases.size())
+        pWinner->SetHealth(pWinner->GetMaxHealth());
-				return; // wrong ID (too high, will crash)
+        if ( pWinner->getPowerType() == POWER_MANA )
-			phases.set(phaseID, false);
+            pWinner->SetPower(POWER_MANA, pWinner->GetMaxPower(POWER_MANA));
-		}
+        pLoser->SetHealth(pLoser->GetMaxHealth());
-		pWinner->RemoveAllSpellCooldown();
+        if ( pLoser->getPowerType() == POWER_MANA )
-		pLoser->RemoveAllSpellCooldown();
+            pLoser->SetPower(POWER_MANA,  pLoser->GetMaxPower(POWER_MANA));
-		pWinner->SetHealth(pWinner->GetMaxHealth());
+    }
-		if ( pWinner->getPowerType() == POWER_MANA )
+
-			pWinner->SetPower(POWER_MANA, pWinner->GetMaxPower(POWER_MANA));
+
-		pLoser->SetHealth(pLoser->GetMaxHealth());
+
-		if ( pLoser->getPowerType() == POWER_MANA )
+
-			pLoser->SetPower(POWER_MANA,  pLoser->GetMaxPower(POWER_MANA));
+    new DuelPhasing();
-	}
+