Fixed a bug with trainers being set incorrectly for caught Pokémon

Their OT was being set to the wild, rather than the actual trainer.
varkor · Dec 26, 2015 · a3a39d0 · a3a39d0
1 parent 9a4e1c4
commit a3a39d0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/battle/scripts/objects/general/pokemon.js b/battle/scripts/objects/general/pokemon.js
@@ -678,16 +678,16 @@ function pokemon (data, validate) {
 	};
 
 	self.belong = function (who) {
-		if (self.trainer)
-			self.trainer.release(self);
-		if (!self.caught) {
+		if (self.caught === null || self.isWild()) {
 			self.caught = {
 				ball : null,
 				location : null,
 				level : self.level,
 				trainer : who.identification
 			};
 		}
+		if (self.trainer)
+			self.trainer.release(self);
 		self.trainer = who;
 	};