Merge branch 'master' into dev

BankEconomyMod/src/me/kaZep/Base/PlayerListener.java

@@ -7551,7 +7551,9 @@ implements Listener
 	@EventHandler
 	public void onPlayerOnFire(EntityCombustEvent e) {
 		if (e.getEntity() instanceof LivingEntity) {
-			doFireAspectDamage(((LivingEntity)e.getEntity()), this.plugin);
+			if (!((LivingEntity)(e.getEntity())).hasPotionEffect(PotionEffectType.FIRE_RESISTANCE)) {
+				doFireAspectDamage(((LivingEntity)e.getEntity()), this.plugin);
+			}
 		}
 		if (e.getEntity().getType()==EntityType.PLAYER) {
 			Player p = (Player)e.getEntity();

BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java

@@ -48,6 +48,8 @@ import org.bukkit.potion.PotionEffectType;
 import sig.ItemSets.DiabloDropsHook;
 import sig.ItemSets.DiabloDropsHook.Tier;
 
+import sig.ItemSets.DiabloDropsHook;
+
 import com.sk89q.worldedit.CuboidClipboard;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;