View difference between Paste ID: LjF5x7h4 and mBUfpgaE

 #include "ScriptPCH.h"
-
+// Edited from Parranoia's script:
-struct KillstreakData
+// http://pastebin.com/mBUfpgaE
 
-	int32 killstreak;
+struct KillstreakData { uint32 killstreak, high_ks; };
-	int32 high_ks;
+static UNORDERED_MAP<uint64, KillstreakData> m_killstreak;
 
 void alertServer(Player * killer, Player * victim, uint32 killstreak, int code)
-typedef std::map<uint64 guid, KillstreakData> KillstreakMap;
+
-static KillstreakMap m_killstreak;
+    char msg[256];
     switch(code)
-int32 GetKillstreak(Player * player, bool high)
+
     case 0: sprintf(msg, "|cffff0000[Killstreak] |cffffffff%s's |cff00ffffkillstreak of %u has been ended by |cffffffff%s", victim->GetName(), killstreak, killer->GetName()); break;
-    QueryResult ks = CharacterDatabase.PQuery("SELECT ks, high_ks FROM killstreak WHERE guid = '%u'", player->GetGUIDLow());
+    case 1: sprintf(msg, "|cffff0000[Killstreak] |cffffffff%s|cff00ffff has a killstreak of %u", killer->GetName(), killstreak); break;
-    if (!ks)
+    case 2: sprintf(msg, "|cffff0000[Killstreak] |cffffffff%s|cff00ffff has a killstreak of %u. A bounty worth 50 arena points has been placed for their head.", killer->GetName(), killstreak); break;
-        return -1;
+
-    Field * killstreak = ks->Fetch();
+
-
+
-    return high ? killstreak[1].GetUInt32() : killstreak[0].GetUInt32();
+
 class Killstreak : public PlayerScript
-
+
-void alertServer(Player * killer, Player * victim, int32 killstreak, int code)
+public:
     Killstreak() : PlayerScript("Killstreak"){}
-	char msg[200];
+
-
+
     {
         uint64 kGUID = killer->GetGUID();
-		case 0:
+        uint64 vGUID = victim->GetGUID();
-	 		sprintf(msg, "|cffff0000[Killstreak] |cffffffff%s's |cff00ffffkillstreak of %d has been ended by |cffffffff%s", victim->GetName(), killstreak, killer->GetName());
+        if (kGUID == vGUID)
-			break;
+
-    	case 1:
+
-			sprintf(msg, "|cffff0000[Killstreak] |cffffffff%s|cff00ffff has a killstreak of %d", killer->GetName(), killstreak);
+
-			break;
+
-	   case 2:
+        m_killstreak[kGUID].killstreak++;
-			sprintf(msg, "|cffff0000[Killstreak] |cffffffff%s|cff00ffff has a killstreak of %d. A bounty worth 50 arena points has been placed for their head.", killer->GetName(), killstreak);
+        uint32 kKillstreak = m_killstreak[kGUID].killstreak;
-			break;
+        uint32 vKillstreak = m_killstreak[vGUID].killstreak;
 
-
+        m_killstreak[kGUID].high_ks = kKillstreak > m_killstreak[kGUID].high_ks ? kKillstreak : m_killstreak[kGUID].high_ks;
 
         if (vKillstreak >= 25)
-
+            killer->ModifyArenaPoints(50);
         if (vKillstreak >= 5)
             alertServer(killer, victim, vKillstreak, 0);
-	public:
+        m_killstreak[vGUID].killstreak = 0;
-        Killstreak() : PlayerScript("Killstreak"){}
+
         if(kKillstreak > 0) // hate large switches
         {
             if(kKillstreak % 5 == 0)
-        if (killer->GetGUIDLow() == victim->GetGUIDLow())
+            {
                 alertServer(killer, victim, kKillstreak, kKillstreak <= 20 ? 1 : 2);
                 if(kKillstreak == 5)
                     killer->AddItem(6657, 5);
                 else if(kKillstreak == 15)
-        int32 kKillstreak = m_killstreak[killer->GetGUID()].killstreak;
+                    killer->AddItem(8529, 15);
-        int32 vKillstreak = m_killstreak[victim->GetGUID()].killstreak;
+                else if(kKillstreak % 10 == 0)
                     killer->AddItem(20558, uint32(kKillstreak/10));
             }
-            killer->SetArenaPoints(killer->GetArenaPoints() + 50);
+
     }
-        if (kKillstreak == -1)
+
-            m_killstreak[killer->GetGUID()].killstreak = 1;
+    void OnLogin(Player* player)
-		  else
+
-			   m_killstreak[killer->GetGUID()].killstreak = kKillstreak++;
+        QueryResult ks = CharacterDatabase.PQuery("SELECT ks, high_ks FROM killstreak WHERE guid = %u", player->GetGUIDLow());
-
+        if (!ks)
-        m_killstreak[killer->GetGUID()].high_ks = kKillstreak > m_killstreak[killer->GetGUID()].high_ks ? kKillstreak : m_killstreak[killer->GetGUID()].high_ks;
+
         Field * killstreak = ks->Fetch();
-		  // Only send a server message if their streak is 5 or more
+        KillstreakData temp = {killstreak[0].GetUInt32(), killstreak[1].GetUInt32()};
-		  if (vKillstreak >= 5)
+        m_killstreak[player->GetGUID()] = temp;
-		  	   alertServer(killer, victim, vKillstreak, 0);
+
-		  m_killstreak[victim->GetGUID()].killstreak = 0;
+
     void OnLogout(Player* player)
-        switch(kKillstreak)
+
         uint64 pGUID = player->GetGUID();
-            case 5:
+        if(m_killstreak.find(pGUID) != m_killstreak.end())
-                alertServer(killer, victim, kKillstreak, 1);
+            CharacterDatabase.PExecute("REPLACE INTO killstreak (guid, ks, high_ks) VALUES (%u, %u, %u)", m_killstreak[pGUID].killstreak, m_killstreak[pGUID].high_ks, player->GetGUIDLow());
-                killer->AddItem(6657, 5);
+
-                break;
+
-            case 10:
+
-                alertServer(killer, victim, kKillstreak, 1);
+
-                killer->AddItem(20558, 1);
+
-                break;
+
-            case 15:
+