Merging 1.9.1 source: actor changes (minus questgivers, they will be done separately)

2015-11-10 04:12:06 -05:00
parent 83d492440e
commit 3fdd6452db
9 changed files with 34 additions and 31 deletions
@@ -321,7 +321,7 @@ public class Hero extends Char {
 	
 	@Override
 	public int dr() {
-		int dr = belongings.armor != null ? Math.max( belongings.armor.DR, 0 ) : 0;
+		int dr = belongings.armor != null ? Math.max( belongings.armor.DR(), 0 ) : 0;
 		Barkskin barkskin = buff( Barkskin.class );
 		if (barkskin != null) {
 			dr += barkskin.level();