From 4f177d305e6e1ec6db0c033ce00833ebd45e3d43 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 28 May 2015 23:54:49 -0400
Subject: [PATCH] v0.3.0b: fixed some freeze and crash bugs relating to actors

---
 src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java  | 2 +-
 .../shatteredpixeldungeon/actors/buffs/Regeneration.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
index 36dd26c79..1ff403f0b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
@@ -193,7 +193,7 @@ public abstract class Actor implements Bundlable {
 
 				//some actors will always go before others if time is equal.
 				if (actor.time < now ||
-						actor.time == now && actor.actPriority < current.actPriority) {
+						actor.time == now && (current == null || actor.actPriority < current.actPriority)) {
 					now = actor.time;
 					current = actor;
 				}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java
index b6a2527ad..899b7e02b 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java
@@ -41,7 +41,7 @@ public class Regeneration extends Buff {
 				if (regenBuff.isCursed())
 					spend( REGENERATION_DELAY * 1.5f );
 				else
-					spend( regenBuff.level()*0.9f );
+					spend( REGENERATION_DELAY - regenBuff.level()*0.9f );
             else
                 spend( REGENERATION_DELAY );