Merging 1.9.1 source: item changes

2015-11-11 02:01:25 -05:00
parent bc1e3ee17a
commit 366dce1610
86 changed files with 409 additions and 352 deletions
@@ -48,7 +48,7 @@ public class Regeneration extends Buff {
 				if (regenBuff.isCursed())
 					spend( REGENERATION_DELAY * 1.5f );
 				else
-					spend( REGENERATION_DELAY - regenBuff.level()*0.9f );
+					spend( REGENERATION_DELAY - regenBuff.itemLevel()*0.9f );
 			else
 				spend( REGENERATION_DELAY );