From 5950244f9f367347a2eee0c41c42984bd213c2f2 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sat, 28 Feb 2015 04:46:32 -0500 Subject: [PATCH] v0.2.4b: crash fix and tweaks to bee AI --- .../shatteredpixeldungeon/actors/mobs/Bee.java | 3 +-- .../shatteredpixel/shatteredpixeldungeon/items/Heap.java | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bee.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bee.java index 8c97d9f30..89232fbda 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bee.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bee.java @@ -133,8 +133,7 @@ public class Bee extends Mob { protected boolean getCloser(int target) { if (enemy != null && Actor.findById(potHolder) == enemy) { target = enemy.pos; - return super.getCloser(target); - } else if (state == WANDERING || (potPos != -1 && Level.distance(target, potPos) > 3)) + } else if (potPos != -1 && (state == WANDERING || Level.distance(target, potPos) > 3)) this.target = target = potPos; return super.getCloser( target ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 2c586c177..0e7d7ac30 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -284,12 +284,6 @@ public class Heap implements Bundlable { //stop processing current explosion, it will be replaced by the new one. return; - } else if (item instanceof Honeypot.ShatteredPot){ - - //need to let the bee know the pot is being destroyed. - ((Honeypot.ShatteredPot) item).goAway(); - items.remove( item ); - //unique and upgraded items can endure the blast } else if (!(item.level > 0 || item.unique)) items.remove( item );