Merging 1.7.5 Source: actors/buffs changes

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java

@@ -37,8 +37,8 @@ public class Paralysis extends FlavourBuff {
 	
 	@Override
 	public void detach() {
-		target.paralysed = false;
 		super.detach();
+		unfreeze(target);
 	}
 	
 	@Override
@@ -55,4 +55,12 @@ public class Paralysis extends FlavourBuff {
 		Resistance r = ch.buff( Resistance.class );
 		return r != null ? r.durationFactor() * DURATION : DURATION;
 	}
+
+	public static void unfreeze( Char ch ) {
+		if (ch.buff( Paralysis.class ) == null &&
+				ch.buff( Frost.class ) == null) {
+
+			ch.paralysed = false;
+		}
+	}
 }