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
@@ -81,7 +81,7 @@ public abstract class Plant implements Bundlable {
 			int naturalismLevel = 0;
 			SandalsOfNature.Naturalism naturalism = Dungeon.hero.buff( SandalsOfNature.Naturalism.class );
 			if (naturalism != null) {
-				naturalismLevel = naturalism.level()+1;
+				naturalismLevel = naturalism.itemLevel()+1;
 			}

 			if (Random.Int( 5 - (naturalismLevel/2) ) == 0) {