From 05f718f1ff2de28189dd7ebd0bc4d7be4e8fbdb3 Mon Sep 17 00:00:00 2001
From: Kevin Lau <ascriptmaster@gmail.com>
Date: Tue, 16 Jun 2015 11:37:09 -0700
Subject: [PATCH] Move Gen 5 Sky Drop's Try handler to TryHit

Fixes glitches preventing it from working properly due to it inheriting
Gen 6's TryHit handler and effectively locking the users in a loop.
---
 mods/gen5/moves.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/mods/gen5/moves.js b/mods/gen5/moves.js
index 1823ad9c28..c4dec53905 100644
--- a/mods/gen5/moves.js
+++ b/mods/gen5/moves.js
@@ -768,25 +768,25 @@ exports.BattleMovedex = {
 	},
 	skydrop: {
 		inherit: true,
-		onTry: function (attacker, defender, move) {
-			if (defender.fainted) return false;
-			if (attacker.removeVolatile(move.id)) {
-				return;
-			}
-			if (defender.volatiles['substitute'] || defender.side === attacker.side) {
-				return false;
-			}
-			if (defender.volatiles['protect']) {
-				this.add('-activate', defender, 'Protect');
+		onTryHit: function (target, source, move) {
+			if (target.fainted) return false;
+			if (source.removeVolatile(move.id)) {
+				if (target !== source.volatiles['twoturnmove'].source) return false;
+
+				if (target.hasType('Flying')) {
+					this.add('-immune', target, '[msg]');
+					this.add('-end', target, 'Sky Drop');
+					return null;
+				}
+			} else {
+				if (target.volatiles['substitute'] || target.side === source.side) {
+					return false;
+				}
+
+				this.add('-prepare', source, move.name, target);
+				source.addVolatile('twoturnmove', target);
 				return null;
 			}
-			if (defender.volatiles['bounce'] || defender.volatiles['dig'] || defender.volatiles['dive'] || defender.volatiles['fly'] || defender.volatiles['shadowforce']) {
-				this.add('-miss', attacker, defender);
-				return null;
-			}
-			this.add('-prepare', attacker, move.name, defender);
-			attacker.addVolatile('twoturnmove', defender);
-			return null;
 		}
 	},
 	sleeppowder: {