From 00eca29f3cbedaf0e316fc3e9abb61280d913ee5 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 27 Apr 2020 20:29:35 -0400
Subject: [PATCH] v0.8.0a: further fixes for the following bugs: - pitfall
 traps working on stationary neutral NPCs (such as questgivers) - connection
 error to pixeldungeoun.watabou.ru due to forced HTTPS

---
 .../shatteredpixeldungeon/levels/traps/PitfallTrap.java       | 4 +++-
 .../shatteredpixeldungeon/scenes/AboutScene.java              | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
index 942048c42..f402d752b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
@@ -102,7 +102,9 @@ public class PitfallTrap extends Trap {
 
 					Char ch = Actor.findChar(cell);
 
-					if (ch != null && !ch.flying) {
+					//don't trigger on flying chars, or immovable neutral chars
+					if (ch != null && !ch.flying
+						&& !(ch.alignment == Char.Alignment.NEUTRAL && Char.hasProp(ch, Char.Property.IMMOVABLE))) {
 						if (ch == Dungeon.hero) {
 							Chasm.heroFall(cell);
 						} else {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java
index d048718e1..2ba285f78 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java
@@ -137,7 +137,7 @@ public class AboutScene extends PixelScene {
 		PointerArea hotArea = new PointerArea( wataLink.left(), wataLink.top(), wataLink.width(), wataLink.height() ) {
 			@Override
 			protected void onClick( PointerEvent event ) {
-				DeviceCompat.openURI( "https://" + LNK_WATA );
+				DeviceCompat.openURI( "http://" + LNK_WATA );
 			}
 		};
 		add( hotArea );