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
@@ -338,11 +338,11 @@ public class Ghost extends NPC {
 					do {
 						another = Generator.randomWeapon(10+i);
 					} while (another instanceof MissileWeapon);
-					if (another.level >= weapon.level) {
+					if (another.level() >= weapon.level()) {
 						weapon = (Weapon) another;
 					}
 					another = Generator.randomArmor(10+i);
-					if (another.level >= armor.level) {
+					if (another.level() >= armor.level()) {
 						armor = (Armor) another;
 					}
 				}