LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.8.0a: further fixes for the following bugs:

Browse Source 
- pitfall traps working on stationary neutral NPCs (such as questgivers)
- connection error to pixeldungeoun.watabou.ru due to forced HTTPS
This commit is contained in:
Evan Debenham 2020-04-27 20:29:35 -04:00
parent b0b62987fc
commit 00eca29f3c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java
View File

@ -102,7 +102,9 @@ public class PitfallTrap extends Trap {
Char ch = Actor.findChar(cell); 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) { if (ch == Dungeon.hero) {
Chasm.heroFall(cell); Chasm.heroFall(cell);
} else { } else {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java
View File

@ -137,7 +137,7 @@ public class AboutScene extends PixelScene {
PointerArea hotArea = new PointerArea( wataLink.left(), wataLink.top(), wataLink.width(), wataLink.height() ) { PointerArea hotArea = new PointerArea( wataLink.left(), wataLink.top(), wataLink.width(), wataLink.height() ) {
@Override @Override
protected void onClick( PointerEvent event ) { protected void onClick( PointerEvent event ) {
DeviceCompat.openURI( "https://" + LNK_WATA ); DeviceCompat.openURI( "http://" + LNK_WATA );
} }
}; };
add( hotArea ); add( hotArea );