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

v0.3.0b: fixed some freeze and crash bugs relating to actors

Browse Source
This commit is contained in:
Evan Debenham 2015-05-28 23:54:49 -04:00
parent d450114d2d
commit 4f177d305e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
View File

@ -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;
}

2
src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Regeneration.java
View File

@ -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 );