Bugfixes to match pipeline

InfectedLan · Feb 13, 2015 · f6c4efd · f6c4efd
1 parent c089802
commit f6c4efd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/json/match/acceptMatch.php b/json/match/acceptMatch.php
@@ -17,7 +17,7 @@
 				MatchHandler::acceptMatch($user, $match);
 
 				if (MatchHandler::allHasAccepted($match)) {
-					if ($match->getCompoId() == 1) {
+					if ($match->getCompoId() == 3) {
 						$match->setState(1);
 					} else {
 						$match->setState(2);

diff --git a/json/match/banmap.php b/json/match/banmap.php
@@ -22,7 +22,7 @@
 				$participants = MatchHandler::getParticipants($match);
 				$clan = $participants[$turn];
 
-				if ($user->equals($clan->getChief())) {
+				if ($user->getId() == $clan->getChief()) {
 					$voteOption = VoteOptionHandler::getVoteOption($_GET['id']);
 
 					if ($voteOption != null) {

diff --git a/scripts/chat.js b/scripts/chat.js
@@ -6,6 +6,12 @@ $(document).ready(function() {
 });
 
 function createChat(divId, chatId, height) {
+	for(var i = 0; i < chatList.length; i++) {
+		if(chatList[i].divId == divId) {
+			console.log("Div id " + divId + " allready exists. Deleting older occurance of it");
+			chatList.splice(i, 1);
+		}
+	}
 	chatList.push({"divId": divId, "chatId": chatId, "lastId": -1});
 	console.log("Created chat id " + chatId + " for divid " + divId + " with height " + height);
 

diff --git a/settings.php b/settings.php
@@ -36,7 +36,7 @@ class Settings {
 	const db_table_infected_compo_memberof = 'memberof';
 	const db_table_infected_compo_memberofchat =  'memberofchat';
 	const db_table_infected_compo_participantof = 'participantof';
-	const db_table_infected_compo_voteoptions = 'voteOptions';
+	const db_table_infected_compo_voteoptions = 'voteoptions';
 	const db_table_infected_compo_participantOfMatch = 'participantofmatch';
 	const db_table_infected_compo_matches = 'matches';
 	const db_table_infected_compo_readyusers = 'readyusers';