Merge pull request #29 from MemeDistributionCo/testing-merge-here

Version 2.1.2 (Fixes)

Author: xDestx

MDCBot/build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 mainClassName = 'com.mdc.bot.MDCBot'
 
-version '2.1.1'
+version '2.1.2'
 
 sourceCompatibility = 1.8
 

MDCBot/src/main/java/com/mdc/bot/command/game/Duel.java

@@ -159,7 +159,7 @@ public MDCBot getBot() {
 	}
 
 	public static Duel getDuelWithPlayer(FightPlayer p) {
-		if(isPlayerInDuel(p.getUser())) {
+		if(isPlayerInActiveDuel(p.getUser())) {
 			for(Duel d : activeDuels) {
 				if(d.getPlayer1() == p || d.getPlayer2() == p) {
 					return d;
@@ -169,7 +169,11 @@ public static Duel getDuelWithPlayer(FightPlayer p) {
 		return null;
 	}
 
-	public static boolean isPlayerInDuel(User p) {
+	public boolean isPlayerInDuel(User u) {
+		return Util.sameUser(u, p1.getUser()) || Util.sameUser(u, p2.getUser());
+	}
+	
+	public static boolean isPlayerInActiveDuel(User p) {
 		for(Duel d : activeDuels) {
 			if(d.getPlayer1().getUser() == p || d.getPlayer2().getUser() == p) return true;
 		}
@@ -209,6 +213,14 @@ public static boolean playerAcceptedDuel(User targetDuelPartner, User accepter)
 			Duel.pendingDuels.remove(d);
 			Duel.activeDuels.add(d);
 			d.sendStartMessage();
+			//Remove player from other pending duels
+			for (Duel toCheck : pendingDuels) {
+				if (toCheck.isPlayerInDuel(accepter) ||
+						toCheck.isPlayerInDuel(targetDuelPartner))
+					pendingDuels.remove(toCheck);
+				Duel.disbandDuel(toCheck);
+			}
+			
 			return true;
 		}
 	}

MDCBot/src/main/java/com/mdc/bot/command/game/DuelCommand.java

@@ -59,7 +59,7 @@ public boolean called(CommandSet s, MDCBot b) {
 					//b.sendMessage(s.getMessageReceivedEvent().getTextChannel(), new MessageBuilder().append("You can't duel bots (Yet)"));
 					//return false;
 				//}
-				if(Duel.isPlayerInDuel(target) || Duel.isPlayerInDuel(initiator)) {
+				if(Duel.isPlayerInActiveDuel(target) || Duel.isPlayerInActiveDuel(initiator)) {
 					//Can't already be in a duel
 					b.sendMessage(s.getMessageReceivedEvent().getTextChannel(), new MessageBuilder().append("Someone is already in a duel"));
 					return false;

README.md

@@ -3,11 +3,11 @@
 
 # Info
 
-Version: 2.1.1 u00
+Version: 2.1.2 u00
 
 When working on the bot, please make a seperate branch for whatever thing you are trying to do. After completing, make a pull request for your branch into the testing-merge branch.
 
-### Version 2.1.1 u00:
+### Version 2.1.2 u00:
 
 ##### Commands:
 All commands start with `--`