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

v0.4.3a: fixed nullpointer exceptions caused by new blob bundle restore behaviour

Browse Source
This commit is contained in:
Evan Debenham 2016-10-24 13:55:59 -04:00
parent 46615e0949
commit b104ad197d
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Alchemy.java
View File

@ -37,12 +37,13 @@ public class Alchemy extends Blob {
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle( bundle ); super.restoreFromBundle( bundle );
for (int i=0; i < cur.length; i++) { if (volume > 0)
if (cur[i] > 0) { for (int i=0; i < cur.length; i++) {
pos = i; if (cur[i] > 0) {
break; pos = i;
break;
}
} }
}
} }
@Override @Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Blob.java
View File

@ -245,7 +245,7 @@ public class Blob extends Actor {
public static int volumeAt( int cell, Class<? extends Blob> type){ public static int volumeAt( int cell, Class<? extends Blob> type){
Blob gas = Dungeon.level.blobs.get( type ); Blob gas = Dungeon.level.blobs.get( type );
if (gas == null) { if (gas == null || gas.volume == 0) {
return 0; return 0;
} else { } else {
return gas.cur[cell]; return gas.cur[cell];

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java
View File

@ -41,12 +41,13 @@ public class WellWater extends Blob {
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle( bundle ); super.restoreFromBundle( bundle );
for (int i=0; i < cur.length; i++) { if (volume > 0)
if (cur[i] > 0) { for (int i=0; i < cur.length; i++) {
pos = i; if (cur[i] > 0) {
break; pos = i;
break;
}
} }
}
} }
@Override @Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java
View File

@ -66,7 +66,7 @@ public class PotionOfPurity extends Potion {
for (int j=0; j < blobs.length; j++) { for (int j=0; j < blobs.length; j++) {
Blob blob = blobs[j]; Blob blob = blobs[j];
if (blob == null) { if (blob == null || blob.volume == 0) {
continue; continue;
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndInfoCell.java
View File

@ -89,7 +89,7 @@ public class WndInfoCell extends Window {
add(info); add(info);
for (Blob blob:Dungeon.level.blobs.values()) { for (Blob blob:Dungeon.level.blobs.values()) {
if (blob.cur[cell] > 0 && blob.tileDesc() != null) { if (blob.volume > 0 && blob.cur[cell] > 0 && blob.tileDesc() != null) {
if (desc.length() > 0) { if (desc.length() > 0) {
desc += "\n\n"; desc += "\n\n";
} }